Skip to content

Commit

Permalink
Merge pull request #141 from msupply-foundation/133-actions-footer-up…
Browse files Browse the repository at this point in the history
…date

133 actions footer update
  • Loading branch information
noel-yeldos authored Jan 9, 2025
2 parents 40ea7ef + d990723 commit 6f369e7
Show file tree
Hide file tree
Showing 37 changed files with 56 additions and 72 deletions.
Binary file removed content/.DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions content/docs/catalogue/assets.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ A list of assets can be exported as a csv file using the `Export` button.

#### Delete

On the Open mSupply Central Server, there is the option to select and delete asset catalogue items using the toolbar action:
On the Open mSupply Central Server, there is the option to select and delete asset catalogue items. The `Actions` footer will display at the bottom of the screen when an asset row is selected:

![Assets delete](/docs/catalogue/images/assets_delete.png)
![Assets delete](/docs/catalogue/images/delete-assets.png)

### Managing status log reasons

Expand All @@ -115,8 +115,8 @@ On this page you can:
This will open a create new reason modal
![New reason modal](/docs/catalogue/images/reasons_create_modal.png)

- Select and delete existing reasons with the `Actions` dropdown
![Delete reason button](/docs/catalogue/images/reasons_delete.png)
- Select reasons to delete them. Action buttons will display at the bottom of the screen when an asset log reason is selected
![Delete reason button](/docs/catalogue/images/delete-asset-log-reasons.png)

- Filter existing reasons by status using the filter dropdown
![Filter reasons](/docs/catalogue/images/reasons_filter.png)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/docs/catalogue/images/delete-assets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions content/docs/coldchain/equipment.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ To add a filter to the page, choose the required filter from the drop down. Mult

#### Delete Equipment

Assets can be selected and deleted using the toolbar action:
Select assets to delete them:

![](/docs/coldchain/images/delete_rows.png)
![Delete coldchain equipment](/docs/coldchain/images/delete-coldchain-equipment.png)

### Importing And Exporting

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 6 additions & 8 deletions content/docs/dispensary/prescriptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ You can delete a prescription from the Prescription list.

1. Select the prescription that you want to delete by checking the box on the left end of the list. You can select more than one prescription to be deleted. You can even select them all using the master checkbox in the list headers.

2. Open the `Select` dropdown (top right corner, above the list) and select `Delete selected lines`.
2. The `Actions` footer will display at the bottom of the screen when a prescription is selected. It will display the number of prescriptions selected and the actions which can be taken. Click `Delete`.

3. A notification confirms how many prescriptions were deleted (bottom left corner).

<div class="note">
You can only delete Prescriptions with a status <code>NEW</code>.
</div>

![Prescription list: delete](/docs/dispensary/images/prescription_list_deleteline.gif)
![Prescription list: delete](/docs/dispensary/images/delete-prescription.gif)

## Creating a Prescription

Expand Down Expand Up @@ -353,17 +353,15 @@ To edit a prescription line, tap on it. You will be presented with the `Edit Ite
### Delete a Prescription line

1. Open the Prescription you want to edit.
2. Select the line(s) you want to delete by checking the box(es) on the right of the list.
3. Go to the `Actions` dropdown menu (top right corner, above the list)
4. Select the action `Delete selected lines`

![Alt Text](/docs/distribution/images/os_actions_deleteselectedlines.png)
2. Select the line(s) you want to delete by checking the box(es) on the left hand side of the list.
3. The `Actions` footer will display at the bottom of the screen when a prescription line is selected. It will display the number of prescription lines selected and the actions which can be taken.
4. Click `Delete`.

<div class="imagetitle">
In the below example, we are deleting <i>item 030063 - Acetylsalicylic Acid 100mg tabs</i>
</div>

![Alt Text](/docs/dispensary/images/prescription_deleteselectedlines.gif)
![Alt Text](/docs/dispensary/images/delete-prescription-line.gif)

<div class="tip">
You can delete multiple lines at once. Be sure to review what is selected before performing the Delete action.
Expand Down
13 changes: 5 additions & 8 deletions content/docs/distribution/customer_returns.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,15 @@ You can delete a return from the Customer Return list.

1. Select the return that you want to delete by checking the box on the left end of the list. You can select more than one return to be deleted. You can even select them all using the master checkbox in the list headers.

2. Open the `Select` dropdown (top right corner, above the list) and select `Delete selected lines`.
2. Click the `Delete` button which appears at the bottom of the page.

3. A notification confirms how many returns were deleted (bottom left corner).

<div class="note">
You can only delete Customer Returns if they have a status of <code>NEW</code>.
</div>

![Inbound list: delete](/docs/distribution/images/ir_delete.gif)
![Inbound list: delete](/docs/distribution/images/delete-customer-return.gif)

## Creating a Customer Return

Expand Down Expand Up @@ -362,16 +362,13 @@ If you set all return quantities to `0`, and click `Next step` you will see this

1. Open the Customer Return you want to edit.
2. Select the line(s) you want to delete by checking the box(es) on the right of the list.
3. Go to the `Actions` dropdown menu (top right corner, above the list)
4. Select the action `Delete selected lines`

![Delete lines actions dropdown](/docs/replenishment/images/or_actions_deletelines.png)
3. Click the `Delete` button which appears at the bottom of the page.

<div class="imagetitle">
In the below example, we are deleting <i>item 030063 - Acetylsalicylic Acid 100mg tabs</i>
In the below example, we are deleting two lines
</div>

![Alt Text](/docs/distribution/images/ir_deleteselectedlines.gif)
![Deleting customer return lines](/docs/distribution/images/delete-customer-return-line.gif)

<div class="tip">
<b></b> You can delete multiple lines at once. Be sure to review what is selected before performing the Delete action.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 12 additions & 16 deletions content/docs/distribution/outbound_shipments.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ You can delete a shipment from the Outbound Shipment list.

1. Select the shipment that you want to delete by checking the box on the left end of the list. You can select more than one shipment to be deleted. You can even select them all using the master checkbox in the list headers.

2. Open the `Select` dropdown (top right corner, above the list) and select `Delete selected lines`.
2. The `Actions` footer will display at the bottom of the screen when a shipment is selected. It will display the number of shipments selected and the actions which can be taken. Click `Delete`.

3. A notification confirms how many shipments were deleted (bottom left corner).

<div class="note">
You can only delete Outbound Shipments if they have not been <code>SHIPPED</code>.
</div>

![Outbound list: delete](/docs/distribution/images/os_list_deleteshipment.gif)
![Outbound list: delete](/docs/distribution/images/delete-outbound-shipment.png)

## Creating an Outbound Shipment

Expand Down Expand Up @@ -508,17 +508,14 @@ To edit a shipment line, tap on it. You will be presented with the `Edit Item` w
### Delete a Shipment line

1. Open the Outbound Shipment you want to edit.
2. Select the line(s) you want to delete by checking the box(es) on the right of the list.
3. Go to the `Actions` dropdown menu (top right corner, above the list)
4. Select the action `Delete selected lines`

![Alt Text](/docs/distribution/images/os_actions_deleteselectedlines.png)
2. Select the line(s) you want to delete by checking the box(es) on the left hand side of the list.
3. Click the `Delete` button which appears at the bottom of the page.

<div class="imagetitle">
In the below example, we are deleting <i>three placeholder lines</i>.
</div>

![Alt Text](/docs/distribution/images/os_deleteselectedlines.gif)
![Alt Text](/docs/distribution/images/delete-outbound-shipment-line.gif)

<div class="tip">
<b></b> You can delete multiple lines at once. Be sure to review what is selected before performing the Delete action.
Expand All @@ -534,9 +531,9 @@ There are 2 main ways to allocate a shipment line:

1. When adding items, the system will automatically assign stock to the new shipment line when you enter a quantity. If you don't have enough stock, the system will add placeholder lines (unallocated lines).

2. Bulk action `Allocate placeholder lines`:
- Select the lines that you want to allocate by checking boxes on the right hand side of the list
- In the `Actions` dropdown menu, select `Allocate placeholder lines`. System will check if there is available stock for each selected line and allocate them using the First to Expire, First Out (FEFO) logic. A notification will let you know whether the operation is successful or not.
2. Bulk action `Allocate placeholder lines`: Select the lines that you want to allocate by checking boxes on the left hand side of the list

3. Click the `Allocate placeholder lines` button which appears at the bottom of the page. System will check if there is available stock for each selected line and allocate them using the First to Expire, First Out (FEFO) logic. A notification will let you know whether the operation is successful or not.

<div class="note">
You won't be able to process your Outbound Shipment if you have unallocated lines (shipment lines without batch number(s) assigned to them) with a quantity greater than 0. You can wait for more stock to arrive or you can delete the placeholder lines. Any unallocated lines with a 0 quantity will automatically be removed for you when you allocate.
Expand All @@ -551,7 +548,7 @@ Once all your shipments lines have been allocated, you can **confirm the allocat

To confirm the allocation, press the `Confirm Allocated` button.

![Alt Text](/docs/distribution/images/os_confirmallocated.gif)
![Alt Text](/docs/distribution/images/confirm-allocated-outbound-shipment-line.gif)

Once the allocation is confirmed:

Expand All @@ -574,7 +571,7 @@ Once all items are picked and packed. You can then confirm the picking of the sh

To confirm that a shipment has been picked, tap on the `Confirm Picked` button.

![Alt Text](/docs/distribution/images/os_confirmpicked.gif)
![Alt Text](/docs/distribution/images/confirm-picked-outbound-shipment-line.gif)

Once picking is confirmed:

Expand Down Expand Up @@ -612,10 +609,9 @@ Sometimes, stock sent via an Outbound Shipment will need to be returned. You can
1. Open the Outbound Shipment for which you would like to process the return of some or all of the stock
2. Make sure that status is at least `SHIPPED`
3. Select the line(s) you want to process the return of by checking the box(es) on the right of the list
4. Go to the `Actions` dropdown menu (top right corner, above the list)
5. Select the action `Process return of selected lines`
4. Click the `Return selected lines` button which appears at the bottom of the page.

![OS return lines](/docs/distribution/images/os_returnlines.gif)
![OS return lines](/docs/distribution/images/return-selected-outbound-shipment-line.gif)

### Select quantity returned

Expand Down
5 changes: 3 additions & 2 deletions content/docs/distribution/requisitions.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ You can delete a requisition from the Requisition list.
1. Select the requisition that you want to delete by checking the box on the
left end of the list. You can select more than one requisition to be deleted.
You can even select them all by using the master checkbox in the header.
2. Open the `Actions` dropdown menu at the top right corner (above the list) and
select `Delete selected lines`.
2. The `Actions` footer will display at the bottom of the screen when a requisition is selected. It will display the number of requisitions selected and the actions which can be taken. Click `Delete`.
3. A confirmation window will appear, asking you to confirm the number of
requisitions to be deleted.
4. After clicking `OK`, a notification will appear in the bottom left corner, confirming that the selected requisitions were deleted.
Expand All @@ -98,6 +97,8 @@ You can delete a requisition from the Requisition list.
You cannot delete requisitions that have been created from an Internal Order, or have had a shipment created from them.
</div>

![Delete Requesition Actions Footer](/docs/distribution/images/delete-response-requisition.png)

### Viewing a Requisition

To view the detail of a particular requisition, simply click on it in the list view.
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions content/docs/inventory/locations.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,7 @@ To edit a location, simply tap on one in the location list.

To delete a location:

1. Check the box of the location that you want to delete in the location list
2. Click on the `Select` dropdown menu and select `Delete selected line`
1. Select location that you want to delete using the checkbox on the left hand side of the list
2. The `Actions` footer will display at the bottom of the screen when a location is selected. It will display the number of locations selected and the actions which can be taken. Click `Delete`

![Delete location](/docs/inventory/images/delete-location.png)
10 changes: 5 additions & 5 deletions content/docs/inventory/stock_takes.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ Sometimes you may want to make changes to many or all of the lines in your stock

### Change location

Use the checkbox column to select the lines you wish to change the location for. Then select the `Change location of lines` option from the `Actions` dropdown.
Use the checkbox column to select the lines you wish to change the location for. The `Actions` footer will display at the bottom of the screen when a stocktake line is selected. It will display the number of stocktake lines selected and the actions which can be taken. Click `Change location`.

![Stocktake actions](/docs/inventory/images/stocktake_actions.png)
![Stocktake actions](/docs/inventory/images/change-location-stocktake-line.png)

This will bring up a window where you can select which location you would like to move the stock lines to:

Expand All @@ -161,9 +161,9 @@ Select a location and press OK. All selected stock lines will now have an update

### Reduce number of packs to 0

Use the checkbox column to select the lines you wish to reduce to 0. Then select the `Reduce lines to 0` option from the `Actions` dropdown.
Use the checkbox column to select the lines you wish to reduce to 0. Click the `Reduce to 0` button which appears at the bottom of the page.

![Stocktake action reduce to 0](/docs/inventory/images/stocktake_action_reduce_to_0.png)
![Stocktake action reduce to 0](/docs/inventory/images/reduce-to-zero-stocktake-line.png)

This will bring up a confirmation popup:

Expand All @@ -177,7 +177,7 @@ Select a reason and press OK. All selected stock lines will now have a `Counted

### Deleting stocktake lines

Use the checkbox column to select the lines you wish to delete. Then select the `Delete selected lines` option from the `Actions` dropdown.
Use the checkbox column to select the lines you wish to delete. The `Actions` footer will display at the bottom of the screen when a stocktake line is selected. It will display the number of stocktake lines selected and the actions which can be taken. Click `Delete`.

This will bring up a confirmation popup:

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions content/docs/programs/immunizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@ You can delete Vaccine Course from the list.

Select the Vaccine Course that you wish to delete by checking the box on the right end of the list. You can select more than one Vaccine Course to be deleted at once. You can even select them all using the master checkbox in the table header.

![vaccine courses: select to delete](/docs/programs/images/vaccine_courses_select.png)
![vaccine courses: select to delete](/docs/programs/images/master-checkbox-immunisations.png)

Open the `Actions` dropdown in the top right corner, above the list, and select `Delete selected lines`.

![vaccine courses: actions](/docs/programs/images/immunizations_actions.png)
The `Actions` footer will display at the bottom of the screen when an immunization line is selected. It will display the number of immunization lines selected and the actions which can be taken. Click `Delete`.

You will be asked to confirm that you wish to delete the selected Vaccine Courses. Press `Cancel` to prevent deleting, or `Ok` to confirm.

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 7 additions & 12 deletions content/docs/replenishment/inbound_shipments.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ You can delete a shipment from the Inbound Shipment list.

1. Select the shipment that you want to delete by checking the box on the left end of the list. You can select more than one shipments to be deleted. You can even select them all using the master checkbox in the list headers.

1. Open the Select dropdown (top right corner, above the list) and select `Delete selected lines`.
2. The `Actions` footer will display at the bottom of the screen when a shipment is selected. It will display the number of shipments selected and the actions which can be taken. Click `Delete`.

A notification confirms how many shipments were deleted (bottom left corner).

Expand Down Expand Up @@ -428,11 +428,10 @@ To edit an Inbound Shipment line, simply tap on it. You will be presented with t

1. Open the Inbound Shipment that you would like to edit
2. Make sure that status is not yet `VERIFIED`
3. Select the line(s) you want to delete by checking the box(es) on the right of the list
4. Go to the `Actions` dropdown menu (top right corner, above the list)
5. Select the action `Delete selected lines`
3. Select the line(s) you want to delete by checking the box(es) on the left of the list
4. Click the `Delete` button which appears at the bottom of the page.

![Alt Text](/docs/replenishment/images/is_deleteselectedlines.gif)
![Alt Text](/docs/replenishment/images/delete-inbound-shipment-line.gif)

<div class="tip">
You can delete multiple lines at once. Be sure to review what is selected before performing the Delete action.
Expand Down Expand Up @@ -487,14 +486,10 @@ Sometimes, you might need to return stock that you received via an Inbound Shipm

1. Open the Inbound Shipment for which you would like to return some or all of the stock
2. Make sure that status is at least `DELIVERED`
3. Select the line(s) you want to return by checking the box(es) on the right of the list
3. Select the line(s) you want to return by checking the box(es) on the left of the list
4. Click the `Return selected lines` button which appears at the bottom of the page.

![Alt Text](/docs/replenishment/images/is_select_to_return.png)

4. Go to the `Actions` dropdown menu (top right corner, above the list)
5. Select the action `Return selected lines`

![Alt Text](/docs/replenishment/images/is_actions_returnlines.png)
![Process return inbound shipment line](/docs/replenishment/images/return-inbound-shipment-line.png)

#### Select quantity to return

Expand Down
15 changes: 6 additions & 9 deletions content/docs/replenishment/supplier_returns.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ You can delete a return from the Supplier Return list.

1. Select the return that you want to delete by checking the box on the left end of the list. You can select more than one return to be deleted. You can even select them all using the master checkbox in the list headers.

2. Open the `Select` dropdown (top right corner, above the list) and select `Delete selected lines`.
2. The `Actions` footer will display at the bottom of the screen when a return is selected. It will display the number of returns selected and the actions which can be taken. Click `Delete`.

3. A notification confirms how many returns were deleted (bottom left corner).

<div class="note">
You can only delete Supplier Returns if they have not been <code>SHIPPED</code>.
</div>

![Outbound list: delete](/docs/replenishment/images/or_delete.gif)
![Outbound list: delete](/docs/replenishment/images/delete-supplier-return.gif)

## Creating a Supplier Return

Expand Down Expand Up @@ -346,17 +346,14 @@ If you set all return quantities to `0`, and click `Next step` you will see this
### Delete a Return Line

1. Open the Supplier Return you want to edit.
2. Select the line(s) you want to delete by checking the box(es) on the right of the list.
3. Go to the `Actions` dropdown menu (top right corner, above the list)
4. Select the action `Delete selected lines`

![Supplier Return actions dropdown](/docs/replenishment/images/or_actions_deletelines.png)
2. Select the line(s) you want to delete by checking the box(es) on the left of the list.
3. Click the `Delete` button which appears at the bottom of the page.

<div class="imagetitle">
In the below example, we are deleting 2 items, with the item codes 030453 and 201116
In the below example, we are deleting 2 items, with the item codes 030063 and 037020
</div>

![Alt Text](/docs/replenishment/images/or_deleteselectedlines.gif)
![Deleting supplier return lines](/docs/replenishment/images/delete-supplier-return-line.gif)

<div class="tip">
<b></b> You can delete multiple lines at once. Be sure to review what is selected before performing the Delete action.
Expand Down
Binary file removed pdf/Open_mSupply_user_guide.pdf
Binary file not shown.
Binary file removed themes/.DS_Store
Binary file not shown.

0 comments on commit 6f369e7

Please sign in to comment.