Skip to content

Commit 05e4434

Browse files
authored
Merge pull request nus-cs2103-AY2021S1#83 from Criss-Wang/master
Fix badge bug
2 parents 250d95a + a839e3a commit 05e4434

8 files changed

Lines changed: 365 additions & 146 deletions

File tree

docs/AboutUs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ checking on LoC contributions and milestones management
5959
[[github](http://github.com/Criss-Wang)]
6060
[[portfolio](team/wangZhenlin.md)]
6161

62-
* Role: Communication/progress manager; Tech Helper;
63-
* Responsibilities:
62+
* Role: Communication/progress manager; Tech Helper;
63+
* Responsibilities:
6464
* In charge of `Delete` command.
6565
* In charge of team communication (Setup channel/meeting schedule/deal with emergency situation).
6666
* Track and manage team progression.

docs/DeveloperGuide.md

Lines changed: 279 additions & 66 deletions
Large diffs are not rendered by default.

docs/UserGuide.md

Lines changed: 76 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,38 @@ and efficient Graphical User Interface interaction.
1919

2020
1. Download the latest `CLInic.jar` from [here](https://github.com/AY2021S1-CS2103-W14-4/tp/releases).
2121

22-
1. Copy the file to the folder you want to use as the _home folder_ for your AddressBook.
22+
1. Copy the file to the folder you want to use as the _home folder_ for your CLI-nic system.
2323

2424
1. Double-click the file to start the app. The GUI similar to the below should appear in a few seconds. Note how the app contains some sample data.<br>
2525
![Ui](images/Ui.png)
2626

2727
1. Type the command in the command box and press Enter to execute it. e.g. typing **`help`** and pressing Enter will display instructions on various commands.<br>
2828
Some example commands you can try:
2929

30-
* **`add`** `w/warehouseA addr/John street, block 123, #01-01 wn/First warehouse` : Adds a warehouse
30+
* **`add`** `w/warehouseA p/00000000 addr/John street, block 123, #01-01 wn/First warehouse` : Adds a warehouse
3131
with the name warehouseA located at John street, block 123, #01-01. The warehouse is noted to be the “First warehouse”.
32-
33-
* **`add`**` s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com sn/largest contractor` : Adds a
32+
33+
* **`add`** `s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com sn/largest contractor` : Adds a
3434
supplier named Philips Pharmaceutical. His contact number is 00000000 and his email is
3535
philipsPharm@gmail.com. The supplier is noted to be the “largest contractor”.
36-
37-
* **`add`**` s/SupplierA p/PANADOL SUSP t/FEVER` : Adds the product PANADOL SUSP to list of products from
36+
37+
* **`add`** `s/SupplierA pd/PANADOL SUSP t/FEVER` : Adds the product PANADOL SUSP to list of products from
3838
supplierA. This indicates that supplierA is selling this product. PANADOL SUSP also has a tag of FEVER.
39-
39+
4040
* **`clear`** : Deletes all contacts.
4141

42-
* **`delete`**` delete supplier 12` : Removes supplier at index 12 from the list of suppliers.
42+
* **`delete`** `delete supplier 12` : Removes supplier at index 12 from the list of suppliers.
4343

4444
* **`exit`** : Exits the app.
4545

46-
* **`find`**` PANADOL warehouse`** : Displays all the warehouses managed by the manager that has a product
46+
* **`find`** `PANADOL warehouse`** : Displays all the warehouses managed by the manager that has a product
4747
named PANADOL.
4848

49-
* **`update`**` w/WarehouseA p/Panadol q/10` : Updates the quantity of Panadol in WarehouseA to 10. The
50-
quantity of Panadol in WarehouseA can be more than 10 or lesser than 10 before the update is done.
49+
* **`update`** `w/WarehouseA pd/Panadol q/10` : Updates the quantity of PANADOL in WarehouseA to 10. The
50+
quantity of PANADOL in WarehouseA can be more than 10 or lesser than 10 before the update is done.
5151

5252
* **`view supplier supplierA`** : Displays all the information associated with supplierA e.g. address, contact, email, products sold by the supplier etc.
5353

54-
5554
1. Refer to the [Features](#features) below for details of each command.
5655

5756
--------------------------------------------------------------------------------------------------------------------
@@ -63,16 +62,16 @@ and efficient Graphical User Interface interaction.
6362
**:information_source: Notes about the command format:**<br>
6463

6564
* Words in `UPPER_CASE` are the parameters to be supplied by the user.<br>
66-
e.g. in `list TYPE`, `TYPE` is a parameter which can be used as `list products`.
65+
e.g. in `delete TYPE INDEX`, `TYPE` is a parameter which can be used as `delete warehouse 1`.
6766

6867
* Items in square brackets are optional.<br>
69-
e.g `[LIST_TYPE] INDEX` can be used as `delete store 12` or as `delete 1`.
68+
e.g `add s/SUPPLIER_NAME p/CONTACT_NUMBER [e/EMAIL_ADDRESS]` can be used as `add s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com` or as `add s/Philips Pharmaceutical p/00000000`.
7069

7170
* Items with ``​ after them can be used multiple times.<br>
7271
e.g. `[t/TAG]…​` can be used as `t/friend`, `t/friend t/family` etc.
7372

7473
* Parameters can be in any order.<br>
75-
e.g. if the command specifies `n/NAME p/PHONE_NUMBER`, `p/PHONE_NUMBER n/NAME` is also acceptable.
74+
e.g. if the command specifies `n/NAME p/CONTACT_NUMBER`, `p/CONTACT_NUMBER n/NAME` is also acceptable.
7675

7776
</div>
7877

@@ -86,18 +85,20 @@ Narrows down to a specific command and its actual input format and samples if sp
8685
Format: `help [COMMAND]`
8786

8887
Examples:
89-
* `help` Display entire list of commands and their description
88+
89+
* `help` Display entire list of `COMMAND` and their description.
9090
* `help add` Displays the detailed description, input format and an input example of add command.
9191

9292
### Adding a warehouse : `add`
9393

9494
Adds warehouse to the CLI-nic application.
9595

96-
Format: `add w/WAREHOUSE_NAME addr/ADDRESS [wn/WAREHOUSE_NOTE]`
96+
Format: `add w/WAREHOUSE_NAME p/CONTACT_NUMBER addr/ADDRESS [wn/WAREHOUSE_NOTE]`
9797

9898
Examples:
99-
* `add w/warehouseA addr/John street, block 123, #01-01 wn/First warehouse` : Adds a warehouse with the name
100-
warehouseA located at John street, block 123, #01-01. The warehouse is noted to be the “First warehouse”.
99+
100+
* `add w/warehouseA p/00000000 addr/John street, block 123, #01-01 wn/First warehouse` Adds a warehouse with the name
101+
warehouseA located at John street, block 123, #01-01. The warehouse's contact number is 00000000. The warehouse is noted to be the “First warehouse”.
101102

102103
### Adding a supplier : `add`
103104

@@ -106,74 +107,78 @@ Adds a supplier to the CLI-nic application.
106107
Format: `add s/SUPPLIER_NAME p/CONTACT_NUMBER [e/EMAIL_ADDRESS] [sn/SUPPLIER_NOTE]`
107108

108109
Examples:
109-
* `add s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com sn/largest contractor` : Adds a
110+
111+
* `add s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com sn/largest contractor` Adds a
110112
supplier named Philips Pharmaceutical. His contact number is 00000000 and his email is philipsPharm@gmail.com. The supplier is noted to be the “largest contractor”.
111113

112114
### Adding a product to a supplier : `add`
113115

114116
Adds product information to a supplier; associates a particular product with the supplier in the CLI-nic application.
115117

116-
Format: `add s/SUPPLIER_NAME p/PRODUCT_NAME [t/TAG...]`
118+
Format: `add s/SUPPLIER_NAME pd/PRODUCT_NAME [t/TAG…​]`
117119

118120
Examples:
119-
* `add s/SupplierA p/PANADOL SUSP t/FEVER` : Adds the product PANADOL SUSP to list of products from supplierA.
121+
122+
* `add s/SupplierA pd/PANADOL SUSP t/FEVER` Adds the product PANADOL SUSP to list of products from supplierA.
120123
* This indicates that supplierA is selling this product. PANADOL SUSP also has a tag of FEVER.
121124

122-
### Update the stock for a product: `update`
125+
### Clearing all entries : `clear`
123126

124-
* If the product does not exist for that store, it will associate the new product with the store and the
125-
* input quantity. Otherwise, it will update the stock of the existing product with the new quantity.
127+
Clears all entries (Suppliers and Warehouses) from the CLI-nic.
126128

127-
Format: `update w/WAREHOUSE_NAME p/PRODUCT_NAME q/QUANTITY`
129+
Format: `clear`
128130

129-
Example:
130-
* `update w/WarehouseA p/Panadol q/10` : Updates the quantity of Panadol in WarehouseA to 10. The
131-
* quantity of Panadol in WarehouseA can be more than 10 or lesser than 10 before the update is done.
131+
### Deletes a particular warehouse or supplier : `delete`
132132

133-
### View a specific supplier / warehouse: `view`
133+
Delete entries of warehouses or suppliers that are not needed anymore.
134134

135-
Shows a particular supplier/warehouse with their relevant information e.g. products associated with the supplier/warehouse, address etc.
135+
Format: `delete TYPE INDEX`
136136

137-
Format: `view TYPE NAME`
138-
* The TYPE specified should be one of these values: supplier or warehouse
139-
* NAME specified is case-insensitive
137+
* The TYPE specified should be one of these values: warehouse / supplier.
138+
* The INDEX must be a positive integer, not exceeding the total number of items.
140139

141140
Examples:
142-
* `view supplier supplierA` Displays all the information associated with supplierA e.g. address, contact, email, products sold by the supplier etc.
143-
* `view warehouse warehouseB` Displays all the information associated with warehouseB e.g. address, all the products stored in the warehouse etc.
141+
142+
* `delete warehouse 1` Removes the warehouse at index 1.
143+
* `delete supplier 12` Removes supplier at index 12 from the list of suppliers.
144144

145145
### Finding medical product associated with warehouses / suppliers: `find`
146146

147147
Finds all suppliers or warehouses managed by the manager that sells the relevant medical products.
148148

149-
Format: `find PRODUCT TYPE`
149+
Format: `find TYPE KEYWORD…​`
150150

151-
* PRODUCT and KEYWORD specified is case-insensitive.
152-
* The TYPE specified should be one of these values: warehouse / supplier
151+
* KEYWORD specified is case-insensitive.
152+
* The TYPE specified should be one of these values: warehouse / supplier.
153153

154154
Examples:
155-
* `find PANADOL warehouse` displays all the warehouses managed by the manager that has a product named PANADOL.
156-
* `find masks supplier` displays all the suppliers that have stock for the input product.
157155

158-
### Deletes a particular warehouse or supplier : `delete`
156+
* `find warehouse PANADOL SUSP` Displays all the warehouses managed by the manager that has a product named PANADOL SUSP.
157+
* `find supplier masks` Displays all the suppliers that have stock for the input product.
159158

160-
Delete entries of warehouses or suppliers that are not needed anymore.
159+
### View a specific supplier / warehouse: `view`
161160

162-
**Format**: `delete TYPE INDEX`
161+
Shows a particular supplier/warehouse with their relevant information e.g. products associated with the supplier/warehouse, address etc.
163162

164-
* The TYPE specified should be one of these values: warehouse / supplier.
165-
* The INDEX must be a positive integer, not exceeding the total number of items.
163+
Format: `view TYPE NAME`
166164

167-
**Examples**
165+
* The TYPE specified should be one of these values: supplier or warehouse.
166+
* The supplier/warehouse NAME specified is case-insensitive.
168167

169-
* `delete warehouse 1` Removes the warehouse at index 1.
170-
* `delete supplier 12` Removes supplier at index 12 from the list of suppliers.
168+
Examples:
171169

172-
### Clearing all entries : `clear`
170+
* `view supplier supplierA` Displays all the information associated with supplierA e.g. address, contact, email, products sold by the supplier etc.
171+
* `view warehouse warehouseB` Displays all the information associated with warehouseB e.g. address, all the products stored in the warehouse etc.
173172

174-
Clears all entries (Suppliers and Warehouses) from the CLI-nic.
173+
### Update the stock for a product: `update`
175174

176-
Format: `clear`
175+
* If the product does not exist for that warehouse, it will associate the new product with the warehouse and the input quantity. Otherwise, it will update the stock of the existing product with the new quantity.
176+
177+
Format: `update w/WAREHOUSE_NAME pd/PRODUCT_NAME q/QUANTITY`
178+
179+
Example:
180+
181+
* `update w/WarehouseA pd/Panadol q/10` Updates the quantity of Panadol in WarehouseA to 10. The quantity of Panadol in WarehouseA can be more than 10 or lesser than 10 before the update is done.
177182

178183
### Exiting the program : `exit`
179184

@@ -187,17 +192,22 @@ CLI-nic data are saved in the hard disk automatically after any command that cha
187192

188193
<br />
189194

190-
### To be implemented in the future
195+
--------------------------------------------------------------------------------------------------------------------
196+
197+
## To be implemented in the future
198+
199+
### Creating a purchase order : `create`
200+
Creates a purchase order to track the purchase of medical products from a supplier to a warehouse.
191201

192-
### **Creating a purchase order : `create`**
193-
* Create a purchase order to track the purchase of medical products from a supplier to a store.
194-
* **Format**: `create sid/SUPPLIER_ID s/STORE_ID id/PRODUCT_ID…​ qty/PRODUCT_QUANTITY…​ date/EXPECTED_DELIVERED_DATE`
195-
* The number specified for PRODUCT_ID cannot exceed the total number of products. All the IDs must be identifiable
196-
* The number of arguments specified for PRODUCT_QUANTITY and PRODUCT_ID must match
197-
* EXPECTED_DELIVERED_DATE must be after current time and of the form YYYY-MM-DD
202+
Format: `create s/SUPPLIER_NAME w/WAREHOUSE_NAME pd/PRODUCT_NAME…​ qty/PRODUCT_QUANTITY…​ date/EXPECTED_DELIVERED_DATE`
203+
204+
* All the SUPPLIER_NAME/WAREHOUSE_NAME/PRODUCT_NAME must be identifiable.
205+
* The number of arguments specified for PRODUCT_QUANTITY and PRODUCT_NAME must match.
206+
* EXPECTED_DELIVERED_DATE must be after current time and of the form YYYY-MM-DD.
207+
208+
Examples:
198209

199-
* **Examples**:
200-
* `create sid/01 s/123 id/1 2 4 8 qty/100 200 400 800 date/2020-12-12` : Creates a purchase order for the delivery of 100, 200, 400 and 800 of products with ID 1, 2, 4 and 8 respectively from supplier ID of 01 to store ID of 123 by December 12, 2020.
210+
* `create s/SupplierA w/WarehouseA pd/Panadol1 Panadol2 qty/100 200 date/2020-12-12` Creates a purchase order for the delivery of 100, 200 of products Panadol1 & Panadol2 respectively from SupplierA to WarehouseA by December 12, 2020.
201211

202212
--------------------------------------------------------------------------------------------------------------------
203213

@@ -212,12 +222,12 @@ CLI-nic data are saved in the hard disk automatically after any command that cha
212222

213223
Action | Format, Examples
214224
--------|------------------
215-
**Add** Warehouse | `add w/WAREHOUSE_NAME addr/ADDRESS [wn/WAREHOUSE_NOTE]`<br> e.g., `add w/warehouseA addr/John street, block 123, #01-01 wn/First warehouse`
225+
**Add** Warehouse | `add w/WAREHOUSE_NAME p/CONTACT_NUMBER addr/ADDRESS [wn/WAREHOUSE_NOTE]`<br> e.g., `add w/warehouseA p/00000000 addr/John street, block 123, #01-01 wn/First warehouse`
216226
**Add** Supplier | `add s/SUPPLIER_NAME p/CONTACT_NUMBER [e/EMAIL_ADDRESS] [sn/SUPPLIER_NOTE]`<br> e.g., `add s/Philips Pharmaceutical p/00000000 e/philipsPharm@gmail.com sn/largest contractor`
217-
**Add** Product | `add s/SUPPLIER_NAME p/PRODUCT_NAME [t/TAG...]`<br> e.g., `add s/SupplierA p/PANADOL SUSP t/FEVER`
227+
**Add** Product | `add s/SUPPLIER_NAME pd/PRODUCT_NAME [t/TAG…​]`<br> e.g., `add s/SupplierA pd/PANADOL SUSP t/FEVER`
218228
**Clear** | `clear`
219-
**Delete** | `delete INDEX`<br> e.g., `delete 3`
220-
**Find** | `find TYPE KEYWORD`<br> e.g. `find product panadol`
229+
**Delete** | `delete TYPE INDEX`<br> e.g., `delete 3`
230+
**Find** | `find TYPE KEYWORD…​`<br> e.g. `find warehouse panadol`
221231
**Help** | `help`
222-
**Update** | `update w/WAREHOUSE_NAME p/PRODUCT_NAME q/QUANTITY` <br> e.g., `update w/WarehouseA p/Panadol q/10`
232+
**Update** | `update w/WAREHOUSE_NAME pd/PRODUCT_NAME q/QUANTITY` <br> e.g., `update w/WarehouseA pd/Panadol q/10`
223233
**View** | `view TYPE NAME`<br> e.g. `view supplier supplierA`

docs/images/Ui.png

106 KB
Loading

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ layout: page
33
title: CLI-nic
44
---
55

6-
[![CI Status](https://github.com/Y2021S1-CS2103-W14-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2021S1-CS2103-W14-4/tp/actions)
7-
[![codecov](https://codecov.io/gh/Y2021S1-CS2103-W14-4/tp/branch/master/graph/badge.svg)](https://codecov.io/gh/AY2021S1-CS2103-W14-4/tp)
6+
[![CI Status](https://github.com/AY2021S1-CS2103-W14-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2021S1-CS2103-W14-4/tp/actions)
7+
[![codecov](https://codecov.io/gh/AY2021S1-CS2103-W14-4/tp/branch/master/graph/badge.svg)](https://codecov.io/gh/AY2021S1-CS2103-W14-4/tp)
88

99
![Ui](images/Ui.png)
1010

docs/team/jeffrey.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ It is written in Java, and has about 10 kLoC.
3131

3232
* **Tools**:
3333
* nil
34-

docs/team/qinliang.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ Given below are my contributions to the project.
1717
* Highlights: This command will allow for future features with regard to inventory management and sales metrics
1818
* Credits: *{mention here if you reused any code/ideas from elsewhere or if a third-party library is heavily used in the feature so that a reader can make a more accurate judgement of how much effort went into the feature}*
1919

20-
* **New Feature**:
20+
* **New Feature**:
2121

2222
* **Code contributed**: [RepoSense link]()
2323

24-
* **Project management**:
24+
* **Project management**:
2525

2626
* **Enhancements to existing features**:
2727

docs/team/wangZhenlin.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ title: Wang Zhenlin's Project Portfolio Page
55

66
## Project: CLI-nic
77

8-
CLI-nic is **an application to help medical supply managers keep track of medical products and storage.** It is optimized
9-
for these managers to **update product supply conditions and access critical product information quickly** via fast typing
10-
and efficient Graphical User Interface interaction.
11-
It is written in Java, and has about __ kLoC.
8+
CLI-nic is **a desktop application to help medical product sales managers keep track of medical products and storage**.
9+
It is optimized for these managers to **update product conditions and access critical product information quickly via fast typing**.
10+
It is written in Java, and has about 10 kLoC.
1211

1312
Given below are my contributions to the project.
1413

@@ -21,7 +20,7 @@ Given below are my contributions to the project.
2120
* Credits: {mention here if you reused any code/ideas from elsewhere or if a third-party library is heavily used in the feature so that a reader can make a more accurate judgement of how much effort went into the feature}
2221

2322
* **Project management**:
24-
* Managed releases `v1.3` - `v1.5rc` (_ releases) on GitHub
23+
* Managed releases `v1.3` - `v1.5rc` (3 releases) on GitHub
2524

2625
* **Enhancements to existing features**:
2726
* Updated the GUI (Pull requests [\#33](), [\#34]())
@@ -47,5 +46,3 @@ Given below are my contributions to the project.
4746

4847
* **Tools**:
4948
* nil
50-
51-

0 commit comments

Comments
 (0)