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

[CS2103T-T12-2] DeliveryMANS #59

Open
wants to merge 832 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
832 commits
Select commit Hold shift + click to select a range
6da6322
Fixed Checkstyle error
MackyMaguire Nov 5, 2019
ba028c5
Merge pull request #198 from MackyMaguire/master
MackyMaguire Nov 5, 2019
e7efeab
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 6, 2019
5f1adaf
Added exception handling for edge case in EditOrderCommand
SoilingRogue Nov 6, 2019
c1ddcdb
Merge pull request #199 from SoilingRogue/master
SoilingRogue Nov 6, 2019
8268bca
Removing unnecessary prefix in Customer's AddCommandParser
ryantay232 Nov 6, 2019
3466989
Finalized autocomplete feature
SoilingRogue Nov 6, 2019
cf37c31
Merge pull request #200 from SoilingRogue/master
SoilingRogue Nov 6, 2019
b84251f
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 6, 2019
14ecce5
Implement AssignOrderCommand for unassigned orders
charliechoong Nov 6, 2019
10e263e
Implement AssignOrderCommand for unassigned orders
charliechoong Nov 6, 2019
7a68fe0
Add OrderName to Orders. Edited related Order commands to suit OrderN…
ryantay232 Nov 6, 2019
51b8f66
Merge remote-tracking branch 'upstream/master' into new-master
ryantay232 Nov 6, 2019
98854c2
Merge branch 'adding-orderName' into new-master
ryantay232 Nov 6, 2019
b824613
Fixing checkstyle errors.
ryantay232 Nov 6, 2019
cdfea3e
Update UG.
ryantay232 Nov 6, 2019
be3b9f9
Merge pull request #202 from ryantay232/new-master
ryantay232 Nov 6, 2019
d79e7f4
Merge branch 'master' into master
charliechoong Nov 6, 2019
11a5cd5
Minor edits
charliechoong Nov 6, 2019
27b6eec
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 6, 2019
35cac83
Merge branch 'master' of https://github.com/charliechoong/main
charliechoong Nov 6, 2019
692f6ea
Merge pull request #201 from charliechoong/master
charliechoong Nov 6, 2019
7e12ffd
Updated with Order Name
MackyMaguire Nov 6, 2019
5ab33cd
Merge pull request #203 from MackyMaguire/master
MackyMaguire Nov 6, 2019
e092f24
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 6, 2019
042e852
Update UserGuide.adoc
SoilingRogue Nov 6, 2019
a45caec
Update UserGuide.adoc
SoilingRogue Nov 6, 2019
f17cbe7
Update UserGuide.adoc
SoilingRogue Nov 6, 2019
9105f84
Changed implementation of CustomerHistoryCommand.
ryantay232 Nov 6, 2019
d460c29
Merge remote-tracking branch 'upstream/master' into new-master
ryantay232 Nov 6, 2019
f5dcd5d
Merge pull request #204 from ryantay232/new-master
ryantay232 Nov 6, 2019
465dfea
Edited order commands and added autocompletion for order names
SoilingRogue Nov 6, 2019
1ba8925
Updated UG and fixed checkstyle errors
SoilingRogue Nov 6, 2019
d7f2e65
Merge pull request #205 from SoilingRogue/master
SoilingRogue Nov 6, 2019
d31f999
Fixed nullpointer exception when adding orders
SoilingRogue Nov 6, 2019
89f915b
Merge pull request #206 from SoilingRogue/master
SoilingRogue Nov 6, 2019
53ccf27
Minor edits to Restaurant Commands
MackyMaguire Nov 6, 2019
12f44ee
Add SignalNewAvailableDeliveryman method in ModelManager
charliechoong Nov 6, 2019
cebbe5b
Merge pull request #207 from charliechoong/master
charliechoong Nov 6, 2019
8e1ed0c
Autoassigning of orders
SoilingRogue Nov 6, 2019
d6ded75
Merge pull request #208 from SoilingRogue/master
SoilingRogue Nov 6, 2019
7c791ab
Implemented auto-assigning of next order after one is completed
SoilingRogue Nov 6, 2019
3057438
Merge pull request #209 from SoilingRogue/master
SoilingRogue Nov 6, 2019
7679244
Update UserGuide.adoc
SoilingRogue Nov 6, 2019
dd79b42
Fixed checkstyle errors
SoilingRogue Nov 6, 2019
d897127
Fixed checkstyle errors
SoilingRogue Nov 6, 2019
0b5af43
Merge pull request #210 from SoilingRogue/master
SoilingRogue Nov 6, 2019
6daf671
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 6, 2019
b105d8b
Merge pull request #211 from MackyMaguire/master
MackyMaguire Nov 6, 2019
abdf7b4
Implement auto assignment of unassigned orders
charliechoong Nov 6, 2019
10b5482
Correct checkstyle errors
charliechoong Nov 6, 2019
fc895b1
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 6, 2019
4c66141
Correct Travis
charliechoong Nov 6, 2019
c1025f6
Merge pull request #212 from charliechoong/master
charliechoong Nov 6, 2019
048d37b
Use strings for SampleDataUtil prices
etlow Nov 6, 2019
32b9cb8
Make Food immutable
etlow Nov 6, 2019
e34caa2
Make Restaurant immutable
etlow Nov 6, 2019
c12cbe9
Merge pull request #213 from etlow/food
etlow Nov 6, 2019
e3b73e6
Updated UserGuide for Restaurant side
MackyMaguire Nov 6, 2019
767c591
Various bug fixes.
ryantay232 Nov 7, 2019
6c9121f
Fixing checkstyle errors.
ryantay232 Nov 7, 2019
b891dc7
Merge pull request #215 from ryantay232/new-master
ryantay232 Nov 7, 2019
2608f0b
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 7, 2019
af70a30
Added Editing Trie
MackyMaguire Nov 7, 2019
3e02774
Merge pull request #216 from MackyMaguire/master
MackyMaguire Nov 7, 2019
ebc7bbc
Remove statement
charliechoong Nov 7, 2019
98baeb5
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 7, 2019
ee66c7b
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 7, 2019
41dc813
Edited Developer Guide
MackyMaguire Nov 7, 2019
0450748
Updated UG & DG
SoilingRogue Nov 8, 2019
f5dd719
Merge pull request #217 from SoilingRogue/master
SoilingRogue Nov 8, 2019
5b71436
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 8, 2019
49187d0
Moved Context to Logic package
MackyMaguire Nov 8, 2019
4668b95
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 8, 2019
5c3a049
Fixed Checkstyle errors
MackyMaguire Nov 8, 2019
171d8bf
Merge pull request #218 from MackyMaguire/master
MackyMaguire Nov 8, 2019
c87fcb7
Improved SampleDataUtil
MackyMaguire Nov 8, 2019
e315cf9
Fixed Bugs
MackyMaguire Nov 8, 2019
5f532b9
Merge pull request #225 from MackyMaguire/master
MackyMaguire Nov 8, 2019
1d7d321
Added JsonAdaptedRestaurantTest.java
MackyMaguire Nov 8, 2019
1aa22bf
Added RestaurantTest.java
MackyMaguire Nov 8, 2019
bdf842a
Fixing bugs.
ryantay232 Nov 8, 2019
54fbb53
Merge pull request #226 from ryantay232/new-master
ryantay232 Nov 8, 2019
61446a3
Added CommandParserTest.java
MackyMaguire Nov 8, 2019
7f63f04
Added CommandTest.java
MackyMaguire Nov 8, 2019
04ea879
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 8, 2019
3b0c12d
Fixed Checkstyle errors
MackyMaguire Nov 8, 2019
9826e79
Fixed Checkstyle errors
MackyMaguire Nov 8, 2019
fe60d92
Merge pull request #227 from MackyMaguire/master
MackyMaguire Nov 8, 2019
37aeff8
Added Backbone for PPP
MackyMaguire Nov 9, 2019
c4964e0
Fixed Checkstyle error
MackyMaguire Nov 9, 2019
dc401e9
Merge pull request #228 from MackyMaguire/master
MackyMaguire Nov 9, 2019
a9805e7
Edit minor changes
charliechoong Nov 9, 2019
166edec
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 9, 2019
b3b7f2d
Updated Ui.png
MackyMaguire Nov 9, 2019
4fc690c
Updated User Guide for Restaurant Side
MackyMaguire Nov 9, 2019
ef25fe6
Edit UG. Fixed bug of order number starting from 2.
ryantay232 Nov 9, 2019
a782088
Merge pull request #229 from ryantay232/new-master
ryantay232 Nov 9, 2019
3208cff
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 9, 2019
a48fac7
Update UG/DG. Attempt to fix certain bugs.
ryantay232 Nov 9, 2019
ed5af1f
Fixing checkstyle errors.
ryantay232 Nov 9, 2019
79425f1
Merge pull request #230 from ryantay232/new-master
ryantay232 Nov 9, 2019
e010849
Edit user guide
charliechoong Nov 10, 2019
c172090
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 10, 2019
0471327
Edit user guide
charliechoong Nov 10, 2019
d62bad5
Correct checkstyle errors
charliechoong Nov 10, 2019
3dbd0a4
Merge pull request #231 from charliechoong/master
charliechoong Nov 10, 2019
319b315
Updated User Guide
SoilingRogue Nov 10, 2019
724dfa7
Merge pull request #232 from SoilingRogue/master
SoilingRogue Nov 10, 2019
a535d7a
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 10, 2019
e14de16
Update Developer Guide
MackyMaguire Nov 10, 2019
5c0adcf
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 10, 2019
f7a974a
Merge pull request #233 from MackyMaguire/master
MackyMaguire Nov 10, 2019
5e50fcb
Update README.adoc
MackyMaguire Nov 10, 2019
b861f96
Updates to DG
SoilingRogue Nov 10, 2019
86be3da
Merge pull request #234 from SoilingRogue/master
SoilingRogue Nov 10, 2019
48f96e5
Fix bug of deleting restaurant doesn't edit customer.
ryantay232 Nov 10, 2019
ea03197
Merge pull request #235 from ryantay232/new-master
ryantay232 Nov 10, 2019
cdeb302
Edit user guide
charliechoong Nov 10, 2019
fd32066
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 10, 2019
b5c95e4
Merge pull request #236 from charliechoong/master
charliechoong Nov 10, 2019
1444eb3
Update DG.
ryantay232 Nov 10, 2019
9928331
Merge remote-tracking branch 'upstream/master' into new-master
ryantay232 Nov 10, 2019
2ee9733
Merge pull request #237 from ryantay232/new-master
ryantay232 Nov 10, 2019
979711a
Updated DG and added Javadoc for Trie classes
SoilingRogue Nov 10, 2019
048dd4f
Fixed checkstyle errors
SoilingRogue Nov 10, 2019
e3fb346
Merge pull request #238 from SoilingRogue/master
SoilingRogue Nov 10, 2019
e8e52fa
Merge https://github.com/AY1920S1-CS2103T-T12-2/main into branch-PPP
SoilingRogue Nov 10, 2019
c45bd81
Added autocomplete sequence diagram for DG
SoilingRogue Nov 10, 2019
d39847b
Updated DG
SoilingRogue Nov 10, 2019
cd696bd
Merge pull request #239 from SoilingRogue/master
SoilingRogue Nov 10, 2019
20221dc
Updated DG
MackyMaguire Nov 10, 2019
c0b95a4
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 10, 2019
f50d7c8
Updates to DG
SoilingRogue Nov 10, 2019
dca3dd0
Merge branch 'branch-PPP'
SoilingRogue Nov 10, 2019
12e3f1b
Updates to DG and PPP
SoilingRogue Nov 10, 2019
1c1c8f3
Merge pull request #240 from SoilingRogue/master
SoilingRogue Nov 10, 2019
39d51b9
Edit user guide
charliechoong Nov 10, 2019
8647854
Make Deliveryman immutable
etlow Nov 10, 2019
c8e3a9f
Remove unused imports from deliveryman
etlow Nov 10, 2019
f1eefd1
Merge pull request #241 from etlow/deliveryman
charliechoong Nov 10, 2019
22d8dfd
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 10, 2019
26a40cc
Add project portfolio.
ryantay232 Nov 10, 2019
f81ba02
Merge remote-tracking branch 'upstream/master' into new-master
ryantay232 Nov 10, 2019
37e6a40
Fix deliveryman status and undo
etlow Nov 10, 2019
e6a8e62
Merge pull request #242 from ryantay232/new-master
ryantay232 Nov 10, 2019
7f28c3c
Revert "Add PPP."
ryantay232 Nov 10, 2019
def58d6
Merge pull request #243 from AY1920S1-CS2103T-T12-2/revert-242-new-ma…
ryantay232 Nov 10, 2019
a4d9a10
Changes
charliechoong Nov 10, 2019
f4596f2
Merge pull request #244 from etlow/deliveryman
etlow Nov 10, 2019
7f8258c
Add PPP.
ryantay232 Nov 10, 2019
e9889bd
Merge pull request #245 from ryantay232/new-master
ryantay232 Nov 10, 2019
6560fd5
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 10, 2019
96ce590
Use equals for check to call setEditingRestaurant
etlow Nov 10, 2019
4bf4e44
Merge pull request #246 from etlow/food
etlow Nov 10, 2019
b303bcb
Make Customer immutable
etlow Nov 9, 2019
7f2d835
Merge pull request #247 from etlow/customer
etlow Nov 10, 2019
21b060d
Updated DG for EditMode
MackyMaguire Nov 10, 2019
8921b93
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
MackyMaguire Nov 10, 2019
45da533
Fixed Checkstyle error
MackyMaguire Nov 10, 2019
935a0f9
Merge pull request #248 from MackyMaguire/master
MackyMaguire Nov 10, 2019
4ba65f2
Update DeveloperGuide
MackyMaguire Nov 11, 2019
f18359c
Set new deliveryman object when assigning order
etlow Nov 11, 2019
baa9546
Add javadoc for orderAssigned method
etlow Nov 11, 2019
5d63271
Remove trailing whitespace in DG
etlow Nov 11, 2019
1626759
Merge pull request #249 from etlow/deliveryman
etlow Nov 11, 2019
743a4d5
Updated UG and PPP
SoilingRogue Nov 11, 2019
6873d5d
Edits to UG
SoilingRogue Nov 11, 2019
73fdd56
Merge pull request #250 from SoilingRogue/master
SoilingRogue Nov 11, 2019
84984a6
Refactor some code and edit UG
charliechoong Nov 11, 2019
ca786d3
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
0adc6b2
Fixed order parsing allowing multiple unallowed prefixes
SoilingRogue Nov 11, 2019
7667de9
Correct checkstyle error
charliechoong Nov 11, 2019
c942ea5
Correct checkstyle error
charliechoong Nov 11, 2019
699a948
Merge pull request #252 from charliechoong/master
charliechoong Nov 11, 2019
2d1fa9b
Update User Guide
charliechoong Nov 11, 2019
70f03e2
Edit SampleUtil data
charliechoong Nov 11, 2019
7326ad1
Edit SampleUtil data and DG
charliechoong Nov 11, 2019
b9e6acf
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
9b9c30b
Updates to PPP
SoilingRogue Nov 11, 2019
2c62ccc
Merge pull request #251 from SoilingRogue/master
SoilingRogue Nov 11, 2019
5a07535
Implement undo till and list commands
etlow Nov 11, 2019
232f253
Slight edit to UG and improvements to PPP.
ryantay232 Nov 11, 2019
487e3d1
Edit README.adoc.
ryantay232 Nov 11, 2019
306f0e9
Edit AboutUs.adoc to include portfolio.
ryantay232 Nov 11, 2019
a9466d1
PPP edit.
ryantay232 Nov 11, 2019
e3fc7a7
Merge pull request #255 from ryantay232/new-master
ryantay232 Nov 11, 2019
8a01d6b
Edit Developer Guide
charliechoong Nov 11, 2019
a5eed65
Update to PPP
SoilingRogue Nov 11, 2019
621ea50
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
9ef25a9
Edit Developer Guide
charliechoong Nov 11, 2019
97c8a96
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
5862682
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
15d7e75
Updates to PPP
SoilingRogue Nov 11, 2019
afdf51a
Merge pull request #257 from charliechoong/master
charliechoong Nov 11, 2019
2a3d09b
Remove DeliverymanAssignCommand
charliechoong Nov 11, 2019
c59d4fe
Updates to PPP
SoilingRogue Nov 11, 2019
0b47418
Updated DG
MackyMaguire Nov 11, 2019
ba78b72
Merge pull request #258 from MackyMaguire/master
MackyMaguire Nov 11, 2019
729128a
Update README.adoc
MackyMaguire Nov 11, 2019
c085d69
Update DG
MackyMaguire Nov 11, 2019
f071f00
Update DG
MackyMaguire Nov 11, 2019
b81afaa
Add instructions for manual testing.
ryantay232 Nov 11, 2019
2c6d924
Updates to PPP
SoilingRogue Nov 11, 2019
0139ee7
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
0e72992
Revert "Add instructions for manual testing."
ryantay232 Nov 11, 2019
e48d76c
Merge remote-tracking branch 'upstream/master' into new-master
ryantay232 Nov 11, 2019
4ebf387
Add more instructions for manual testing.
ryantay232 Nov 11, 2019
07b9948
Create a test for deliveryman
charliechoong Nov 11, 2019
48fe8f1
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
01f5e1a
Merge pull request #259 from ryantay232/new-master
ryantay232 Nov 11, 2019
4c04588
Merge pull request #254 from etlow/undo
etlow Nov 11, 2019
d70b514
Create a test for deliveryman
charliechoong Nov 11, 2019
639a197
Remove redundant imports
charliechoong Nov 11, 2019
956770a
Remove redundant imports
charliechoong Nov 11, 2019
1018da9
Merge pull request #260 from charliechoong/master
charliechoong Nov 11, 2019
e636f70
Update AboutUs
MackyMaguire Nov 11, 2019
ac423c8
Edit DG and UG
charliechoong Nov 11, 2019
1f6706c
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
0d84a2b
Edit DG and PPP
charliechoong Nov 11, 2019
ada0d9c
Updates to PPP and activity diagram of DG
SoilingRogue Nov 11, 2019
308fdc8
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
bc9e98e
Document undo commands in user guide
etlow Nov 11, 2019
225d2fa
Edit PPP
charliechoong Nov 11, 2019
71b4a6b
Merge pull request #261 from etlow/undo-docs
etlow Nov 11, 2019
e9947ee
Merge pull request #262 from charliechoong/master
charliechoong Nov 11, 2019
29a8279
Updates to DG and fixed checkstyle errors
SoilingRogue Nov 11, 2019
a4e150c
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
6710ca7
Merge pull request #256 from SoilingRogue/master
SoilingRogue Nov 11, 2019
4ca14e6
Update DeveloperGuide.adoc
SoilingRogue Nov 11, 2019
4c2cca4
Update PPP
MackyMaguire Nov 11, 2019
982c222
Merge pull request #263 from MackyMaguire/master
MackyMaguire Nov 11, 2019
4e4618b
Update undo tests
etlow Nov 11, 2019
b72ab1b
Merge pull request #264 from etlow/undo
etlow Nov 11, 2019
f3b26b6
Update DeveloperGuide.adoc
SoilingRogue Nov 11, 2019
e52ecb2
Update AboutUs.adoc
etlow Nov 11, 2019
d70848a
Added sequence diagram for DG
SoilingRogue Nov 11, 2019
7111574
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
ade5e83
Edit PPP
charliechoong Nov 11, 2019
27840eb
Merge remote-tracking branch 'upstream/master'
charliechoong Nov 11, 2019
2032cf7
Edit PPP
charliechoong Nov 11, 2019
7fefe27
Updates to DG
SoilingRogue Nov 11, 2019
bb17e38
Merge pull request #265 from SoilingRogue/master
SoilingRogue Nov 11, 2019
cbdf9fa
Edit PPP
charliechoong Nov 11, 2019
33f1ab7
Updates to DG
SoilingRogue Nov 11, 2019
b769237
Merge pull request #266 from charliechoong/master
charliechoong Nov 11, 2019
20e5a51
Updates to DG
SoilingRogue Nov 11, 2019
e03dc50
Merge https://github.com/AY1920S1-CS2103T-T12-2/main
SoilingRogue Nov 11, 2019
5a60f0a
Merge pull request #267 from SoilingRogue/master
SoilingRogue Nov 11, 2019
c90a9a2
Update undo DG
etlow Nov 11, 2019
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store
*.iml
40 changes: 28 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,34 +1,50 @@
= Address Book (Level 3)
= DeliveryMANS
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://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
https://travis-ci.org/AY1920S1-CS2103T-T12-2/main[image:https://travis-ci.org/AY1920S1-CS2103T-T12-2/main.svg?branch=master[Build Status]]

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

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/Ui.png[width="900"]
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.
== About

*DeliveryMANS* is an acronym for Delivery MANagement System. This system is for administrators in food delivery services to manage the restaurants, customers and deliverymen using their food delivery services.

=== All-in-one UI

The UI allows the administrator to have a good overview of all the information needed for tasks to be done efficiently.

=== Deliverymen tracking

Administrators will be able to track the deliverymen on deliveries at a glance. This allows the administrator to manage them better and efficiently queue the orders to each deliverymen.

=== Automated food tagging

Popular food items on each restaurant's menu are tagged automaticall with a "Popular" tag depending on how many times that food has been ordered.

=== Automated customer tagging

Customer's favourite cuisine will be tagged automatically depending on the orders the customer has made. The top two cuisine tag will be displayed on the UI of the customer.

=== CLI based input

The application is a combination of GUI outputs and CLI inputs to allow the administrator to input commands efficiently just using the keyboard.

== Site Map

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

== Acknowledgements

* Original source of the code i.e. AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org
* 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]
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.Main'
mainClassName = 'seedu.deliverymans.Main'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand Down Expand Up @@ -67,7 +67,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,7 +133,7 @@ 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-name': 'DeliveryMANs',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]
Expand Down
48 changes: 24 additions & 24 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
: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.}_ +
DeliveryMANs was developed by the https://github.com/orgs/AY1920S1-CS2103T-T12-2/teams/developers[AY2019/20 S1 CS2103-T12-02] team. +
{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>>]
=== Choong Jin Yao
image::charliechoong.png[width="150", align="left"]
{empty}[https://github.com/charliechoong[github]] [<<charliechoong#, portfolio>>]

Role: Project Advisor
Role: Developer +
Responsibilities: Code Quality, Documentation, Integration, Testing

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Low Ee Ter
image::https://comp.nus.edu.sg/~lowet/n20191002.jpg[width="150", align="left"]
image:etlow.png[]
{empty}[https://github.com/etlow[github]]

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Code Quality, Documentation, Integration, Testing

'''

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

Role: Developer +
Responsibilities: Data
Responsibilities: Code Quality, Documentation, Integration, Testing

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Stanley Yuan
image::soilingrogue.png[width="150", align="left"]
{empty}[https://github.com/SoilingRogue[github]][<<soilingrogue#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Code Quality, Documentation, Integration, Testing

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Zhou Tianyu
image::mackymaguire.png[width="150", align="left"]
{empty}[http://github.com/MackyMaguire[github]] [<<mackymaguire#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Code Quality, Documentation, Integration, Testing

'''
16 changes: 13 additions & 3 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
= Contact Us
= Contact Us :grinning:
: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/AY1920S1-CS2103T-T12-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 any of us through our emails as stated below : +

** *Choong Jin Yao* : [email protected]_
** *Low Ee Ter* : [email protected]_
** *Ryan Tay* : [email protected]_
** *Stanley Yuan*: [email protected]_
** *Zhou Tianyu* : [email protected]_



Loading