Merge branch 'staging' into 2025-01-dispensing-changes

msupply-foundation · Jan 8, 2025 · 7cddfd9 · 7cddfd9
2 parents ff2ee73 + 2ca16d4
commit 7cddfd9
Show file tree

Hide file tree

Showing 46 changed files with 92 additions and 8 deletions.
diff --git a/content/docs/catalogue/images/cat_itemslist.png b/content/docs/catalogue/images/cat_itemslist.png
diff --git a/content/docs/catalogue/images/cat_mllist.png b/content/docs/catalogue/images/cat_mllist.png
diff --git a/content/docs/coldchain/images/breaches_list.png b/content/docs/coldchain/images/breaches_list.png
diff --git a/content/docs/coldchain/images/chart_view.png b/content/docs/coldchain/images/chart_view.png
diff --git a/content/docs/coldchain/images/chart_view_too_much_data.png b/content/docs/coldchain/images/chart_view_too_much_data.png
diff --git a/content/docs/coldchain/images/delete_rows.png b/content/docs/coldchain/images/delete_rows.png
diff --git a/content/docs/coldchain/images/equipment_list.png b/content/docs/coldchain/images/equipment_list.png
diff --git a/content/docs/dispensary/images/click_new_prescription.png b/content/docs/dispensary/images/click_new_prescription.png
diff --git a/content/docs/dispensary/images/prescription_add_item_button.png b/content/docs/dispensary/images/prescription_add_item_button.png
diff --git a/content/docs/dispensary/images/prescription_backdate_highlight.png b/content/docs/dispensary/images/prescription_backdate_highlight.png
diff --git a/content/docs/dispensary/images/prescription_created.png b/content/docs/dispensary/images/prescription_created.png
diff --git a/content/docs/distribution/images/click_new_requisition.png b/content/docs/distribution/images/click_new_requisition.png
diff --git a/content/docs/distribution/images/os-after-master-list.png b/content/docs/distribution/images/os-after-master-list.png
diff --git a/content/docs/distribution/images/os_click_new_shipment.png b/content/docs/distribution/images/os_click_new_shipment.png
diff --git a/content/docs/distribution/images/os_placeholderlines.png b/content/docs/distribution/images/os_placeholderlines.png
diff --git a/content/docs/distribution/images/req_list.png b/content/docs/distribution/images/req_list.png
diff --git a/content/docs/distribution/images/requisition-detail.png b/content/docs/distribution/images/requisition-detail.png
diff --git a/content/docs/getting_started/dashboard.es.md b/content/docs/getting_started/dashboard.es.md
@@ -19,15 +19,15 @@ Sí, el término _tablero de control_ se utiliza para más de una cosa. En el ca
 
 ## ¿Qué se muestra?
 
-![The dashboard!](/docs/introduction/images/dashboard.png)
+![The dashboard!](/docs/getting_started/images/dashboard.png)
 
 Puedes ver algunas estadísticas para envíos e inventario:
 
 - Entradas
   - **Hoy** Muestra el número de entradas creadas el día de hoy
   - **Esta semana** El número de entradas creadas esta semana.
 - Salidas
-  - **Hoy** El número de envíos a recoger el día de hoy, es decir, los envíos en el estado de `Asignado` 
+  - **Hoy** El número de envíos a recoger el día de hoy, es decir, los envíos en el estado de `Asignado`
 - Inventario
   - **Caducado** El número de líneas de inventario en el almacén actual que han caducado
   - **Próximos a caducar** El número de líneas de inventario en el almacén actual que caducarán en los próximos tres meses
@@ -36,4 +36,3 @@ Puedes ver algunas estadísticas para envíos e inventario:
   - **Menos de 3 meses de inventario** Basado en el consumo mensual promedio (AMC) para este artículo en el almacén actual
 
 Además, hay botones hacia la parte inferior de la página que te permiten crear envíos y requisiciones.
-
diff --git a/content/docs/getting_started/dashboard.md b/content/docs/getting_started/dashboard.md
@@ -20,7 +20,7 @@ Open mSupply has a landing page which gives an overview of some statistics, and
 
 ## What's on display?
 
-![The dashboard!](/docs/introduction/images/dashboard.png)
+![The dashboard!](/docs/getting_started/images/dashboard.png)
 
 You can see some statistics for shipments and stock:
 
@@ -49,4 +49,4 @@ You can see some statistics for shipments and stock:
 There are buttons towards the bottom of the page as well which allow you to create shipments and requisitions.
 
 Clicking on the headings (e.g. `Inbound Shipments`, `Shipments` etc) will take you to the list of those items.
-In addition, clicking on the text beside an item (e.g. `Have not been shipped`) will take you to a view which gives you a list which is filtered to show all the records which match the condition listed. The exception to this is the statistics shown under `Stock levels` which currently do not have filters available.
+In addition, clicking on the text beside an item (e.g. `Have not been shipped`) will take you to a view which gives you a list which is filtered to show all the records which match the condition listed. The exception to this is the statistics shown under `Stock levels` which currently do not have filters available.
diff --git a/content/docs/getting_started/images/admin_button.png b/content/docs/getting_started/images/admin_button.png
diff --git a/content/docs/getting_started/images/dashboard.png b/content/docs/getting_started/images/dashboard.png
diff --git a/content/docs/getting_started/images/user_modal.png b/content/docs/getting_started/images/user_modal.png
diff --git a/content/docs/getting_started/tutorial.md b/content/docs/getting_started/tutorial.md
@@ -76,6 +76,14 @@ Some users have access to more than one store. To change the store which is curr
 
 You will see the notification and the store name in the footer will be updated. From now, all actions will be in the newly selected store.
 
+You can view your user information by clicking on your username:
+
+![Admin](/docs/getting_started/images/admin_button.png)
+
+You can also log out from here:
+
+![User modal](/docs/getting_started/images/user_modal.png)
+
 In a similar way, you can select another language by clicking on the current language in the footer:
 
 ![Footer](/docs/introduction/images/footer_select_language.png)
@@ -86,8 +94,8 @@ If store properties have been configured for your Open mSupply system, you will
 
 ## Help!
 
-If you get stuck at any time when using the site, click on the `Docs` menu item.
+If you get stuck at any time when using the site, click on the `Help` menu item.
 
-![Docs](/docs/introduction/images/docs_nav.png)
+![Docs](/docs/help/images/help_nav.png)
 
-This will take you to the documentation page which relates to the current page you are viewing.
+Use the [Help](/docs/help/help) page to access the Open mSupply User Guide (where you are now!) The Help page is also where you can reach out to us with any feedback or support requests.
diff --git a/content/docs/help/_index.md b/content/docs/help/_index.md
@@ -0,0 +1,10 @@
++++
+title = "Help"
+description = "User guide and contact form"
+date = 2025-01-06T11:45:00+00:00
+updated = 2025-01-06T11:45:00+00:00
+template = "docs/section.html"
+sort_by = "weight"
+weight = 75
+draft = false
++++
diff --git a/content/docs/help/help.md b/content/docs/help/help.md
@@ -0,0 +1,52 @@
++++
+title = "Help"
+description = "Contact mSupply Foundation"
+date = 2025-01-06T11:45:00+00:00
+updated = 2025-01-06T11:45:00+00:00
+template = "docs/page.html"
+sort_by = "weight"
+weight = 1
+draft = false
+
+[extra]
+toc = true
+top = false
++++
+
+The Help page allows you to reach out to us with any feedback or support requests.
+
+## Viewing the Help page
+
+To view the Help page, go to `Help` in the lower section of the navigation panel:
+
+![Help: nav](/docs/help/images/help_nav.png)
+
+This will take you to the Help page:
+
+![Help Page](/docs/help/images/help_page.png)
+
+### User Guide
+
+To view our documentation, click on `View Online Version`:
+
+![User Guide Link](/docs/help/images/user_guide_button.png)
+
+This will take you to the mSupply documentation and user guides page:
+
+![mSupply Documentation](/docs/help/images/msupply_documentation.png)
+
+### Contact Us
+
+Let us know why you are getting in touch by clicking the dropdown:
+
+![Help: reason](/docs/help/images/contact_form_reason.png)
+
+Fill out the rest of the form accordingly:
+
+![Help: body](/docs/help/images/contact_form_body.png)
+
+After filling out the form, click send when satisfied with your message:
+
+![Help: send](/docs/help/images/contact_form_send.png)
+
+The mSupply Support team will receive your message, and be in touch soon to respond to support requests.
diff --git a/content/docs/help/images/_index.md b/content/docs/help/images/_index.md
@@ -0,0 +1,10 @@
++++
+title = "Help"
+description = "Contact form and link to user guide"
+date = 2025-01-06T11:45:00+00:00
+updated = 2025-01-06T11:45:00+00:00
+template = "docs/section.html"
+sort_by = "weight"
+weight = 6
+draft = false
++++
diff --git a/content/docs/help/images/contact_form_body.png b/content/docs/help/images/contact_form_body.png
diff --git a/content/docs/help/images/contact_form_reason.png b/content/docs/help/images/contact_form_reason.png
diff --git a/content/docs/help/images/contact_form_send.png b/content/docs/help/images/contact_form_send.png
diff --git a/content/docs/help/images/help_nav.png b/content/docs/help/images/help_nav.png
diff --git a/content/docs/help/images/help_page.png b/content/docs/help/images/help_page.png
diff --git a/content/docs/help/images/msupply_documentation.png b/content/docs/help/images/msupply_documentation.png
diff --git a/content/docs/help/images/user_guide_button.png b/content/docs/help/images/user_guide_button.png
diff --git a/content/docs/introduction/images/dashboard.png b/content/docs/introduction/images/dashboard.png
diff --git a/content/docs/inventory/images/loc_loclist.png b/content/docs/inventory/images/loc_loclist.png
diff --git a/content/docs/inventory/images/stocktake_newstocktake.png b/content/docs/inventory/images/stocktake_newstocktake.png
diff --git a/content/docs/inventory/images/stocktake_stocktakelist.png b/content/docs/inventory/images/stocktake_stocktakelist.png
diff --git a/content/docs/programs/program_indicators.md b/content/docs/programs/program_indicators.md
@@ -41,3 +41,8 @@ HIV is only available on Programs where "HIV" has been enabled.
 ![Indicators edit](/docs/programs/images/indicators_edit.png)
 
 From here you can enter in the data, as configured for each indicator of this program.
+
+<div class='note'>
+    Only indicators which are set to active will show up for any requisition. This includes requisitions made with indicators which were previously active; they will no longer be displayed.
+    Indicator lines which don't have a value also not be displayed.
+</div>
diff --git a/content/docs/replenishment/images/authorisation-requisition-detail-approved.png b/content/docs/replenishment/images/authorisation-requisition-detail-approved.png
diff --git a/content/docs/replenishment/images/authorisation-requisition-detail-pending.png b/content/docs/replenishment/images/authorisation-requisition-detail-pending.png
diff --git a/content/docs/replenishment/images/intord_list.png b/content/docs/replenishment/images/intord_list.png
diff --git a/content/docs/replenishment/images/intord_newreqbutton.png b/content/docs/replenishment/images/intord_newreqbutton.png
diff --git a/content/docs/replenishment/images/is_select_to_return.png b/content/docs/replenishment/images/is_select_to_return.png
diff --git a/content/docs/replenishment/images/or_filter.png b/content/docs/replenishment/images/or_filter.png
diff --git a/content/docs/settings/images/admin_nav.png b/content/docs/settings/images/admin_nav.png
diff --git a/content/docs/sync/images/sync_nav.png b/content/docs/sync/images/sync_nav.png