### Searching for a dashboard
-You can search for a specific dashboard using the search field in the upper left of the dashboards bar entitled “Search for a dashboard”. The search is case insensitive, and as you type, the list of dashboards will be narrowed down to those that match your search text.
+You can search for a specific dashboard using the search field available from the Dashboards dropdown selector in the title bar. The search is case insensitive, and as you type, the list of dashboards will be narrowed down to those that match your search text.
-
-
-### Personalizing the height of the dashboards bar { #dashboards_personalize_bar }
-
-You can set a specific height for the dashboards bar by
-down-clicking and dragging the bottom edge of the bar. When you finish dragging, the new height will be set. Clicking on the down arrow at the bottom of the dashboards bar will expand the bar to its maximum height (10 "rows"). Clicking on the up arrow will reset the height to your personalized height.
+
## Creating and editing a dashboard
-To create a new dashboard, click the **+** button in the left corner of the dashboards bar to enter create/edit mode:
+To create a new dashboard, click the **+** button in the upper corner of the title bar to enter create/edit mode:
-To edit an existing dashboard, click the **Edit** button next to the dashboard title (you must have edit access to see this button):
+To edit an existing dashboard, click the **Edit** button (you must have edit access to see this button):
-
+
-In create/edit mode, you can add or change the dashboard title, description and dashboard items. If you do not add a title, the dashboard will automatically be titled "Untitled dashboard".
+In create/edit mode, you can add or change the dashboard title, description, dashboard code and dashboard items. If you do not add a title, the dashboard will automatically be titled "Untitled dashboard".
### Adding items to the dashboard
-Add items to the dashboard by searching for items using the **Search for items to add to this dashboard** drop down selector. Item types are:
+Add items to the dashboard by searching for items using the **Search for items to add to this dashboard** dropdown selector. Item types are:
-- Visualizations (charts and tables)
+- Visualizations (charts and pivot tables)
- Maps
+- Line lists
- Event reports
- Event charts
- Reports
@@ -80,14 +76,14 @@ Add items to the dashboard by searching for items using the **Search for items t
-The list of items in the drop-down initially displays 10 visualizations (charts and tables), and 5 from each of the other categories, based on the search text you enter. Messages (Email), text boxes and spacer items are also found in the list. To view more items, click on **Show more**, and the list for that type will be extended to 25 items. If you still do not find the item you want, try typing a more specific search text.
+The list of items in the dropdown initially displays 10 visualizations (charts and tables), and 5 from each of the other categories, based on the search text you enter. To view more items, click on **Show more**, and the list for that type will be extended to 25 items. If you still do not find the item you want, try typing a more specific search text. Messages (Email), text boxes and spacer items can also be chosen from the list.
#### Dashboard layout and placement of new items
When adding items to the dashboard you can choose an overall layout by clicking on **Change layout** button. You can change this layout setting at any time.
- With _Freeflow_ layout, the added items can be moved using the mouse by down-clicking on the item and dragging it to the desired position. Items can also be resized with the mouse by down-clicking on the drag handle in the lower right corner of the item and dragging to the desired size.
-- With _Fixed columns_ layout, you can choose the number of columns to have on the dashboard, and the dashboard will automatically be layed out for you. Items cannot be moved or resized in _Fixed columns_ layout.
+- With _Fixed columns_ layout, you can choose the number of columns to have on the dashboard, and the dashboard will automatically be layed out for you. Items cannot be moved or resized in _Fixed columns_ layout. If you want to make custom adjustments to a _Fixed columns_ layout, return to a _Freeflow_ layout.
@@ -109,13 +105,13 @@ Spacer in **view mode**:
#### Removing items
-Remove items by clicking on the red trash can at the upper right of the item. Be aware that when you remove an item while in _Freeflow_ layout, the items that are positioned below the removed item will "rise" upwards until they bump into an item above.
+Remove items by clicking on the red trash can at the upper right of the item. Be aware that when you remove an item while in _Freeflow_ layout, the items that are positioned below the removed item will "rise" upwards until they bump into an item above. in _Fixed columns_ layout, the items will be adjusted to fill every column in the layout so there are no empty column slots.
### Actions in create/edit mode
In create/edit mode you will see the following buttons in the actions bar at the top of the page: **Save changes**, **Print preview**, **Filter settings**, **Translate**, **Delete**, and **Exit without saving**. The **Translate** and **Delete** buttons are only shown if you are editing an existing dashboard.
-
+
### Saving the dashboard
@@ -137,7 +133,7 @@ By default, users will be able to filter dashboard items by any dimension define
To restrict available filters, you can click **Only allow filtering by selected dimensions** and select the filters you wish to allow on the dashboard. Period and Organisation Unit are selected by default but can be removed if desired. When the dashboard is viewed, users will only be able to choose from among the filters selected.
-
+
In order to save updates to filter settings, you need to first click **Confirm** to close the Filter settings dialog and then click **Save changes** to save the dashboard changes.
@@ -145,41 +141,50 @@ In order to save updates to filter settings, you need to first click **Confirm**
### Translating dashboard title and description
-If you are editing an existing dashboard, then there will be a **Translate** button. Click on this button to open the Translation dialog, which provides a list of languages to translate to, and shows the original dashboard title underneath the name input field. First choose the language you want to translate for, then fill in the dashboard name and description translation.
+If you are editing an existing dashboard, then there will be a **Translate** button. Click on this button to open the Translation dialog, which provides a list of languages to translate to, and shows the original dashboard title and description. First choose the language you want to translate for, then fill in the dashboard name and description translation.
-
+
### Deleting a dashboard
If you have access to delete the dashboard, then there will be a **Delete** button. When you click the **Delete** button, a confirmation dialog will first be displayed to confirm that you want to delete the dashboard.
-
+
## Viewing a dashboard
-From view mode, you can toggle showing the description, star a dashboard, apply filters, print the dashboard, make the dashboard available offline, and share the dashboard with other users and user groups.
+The following actions are available on the dashboard in view mode:
+
+- Set the show/hide description setting
+- Star the dashboard so it appears first in the dashboard list
+- Filter the dashboard
+- Print the dashboard
+- Display the dashboard in a slideshow
+- Make the dashboard available offline
+- Share the dashboard with other users and user groups
+- Close the dashboard
### Show description { #dashboard-show-description }
-To toggle the description, open the **...More** menu and choose **Show description** (or **Hide description**). This setting will be remembered for all dashboards that you open. This setting applies to you, not other users.
+To toggle the description, open the **...** menu and choose **Show description** (or **Hide description**). This setting will be remembered for all dashboards that you open. This setting applies to you, not other users.
### Star dashboards { #dashboard-star-dashboard }
-Your starred dashboards are listed first in the list of dashboards for quick access. To star a dashboard, click on the star button to the right of the title. You can also toggle the star from the **...More** menu. When the star is “filled”, that means the dashboard is starred. Starring a dashboard only applies to you, not other users.
+Your starred dashboards are listed first in the list of dashboards for quick access. To star a dashboard, click on the star button to the right of the title. You can also toggle the star from the **...** menu. When the star is “filled”, that means the dashboard is starred. Starring a dashboard only applies to you, not other users.
-### Filtering a dashboard
+### Filter a dashboard
Applying filters to a dashboard change the data displayed in dashboard items containing visualizations. The filters are applied to each dashboard item in the same way: each added filter overrides the original value for that dimension in the original chart, table or map. It is possible to filter on Organisation Units and Periods, as well as dynamic dimensions, depending on the DHIS2 instance. You can apply multiple filters to the dashboard.
-To add a filter, click on the **Add Filter** button and choose a dimension:
+To add a filter, click on the **Filter** button and choose a dimension:
A dialog opens where the filter selection can be made.
-
+
Click on **Confirm** in the dialog to apply the filter to the
current dashboard.
@@ -192,23 +197,31 @@ You can edit a filter by clicking on the filter badge to open the filter selecti
By default, users are able to filter dashboard items by any dimension defined in the DHIS2 instance. To limit available filters, see [Restricting dashboard filters](#restricting-dashboard-filters).
-### Making dashboards available offline
+### Display the dashboard in a slideshow { #dashboard-slideshow }
+
+The dashboard can be displayed in a slideshow by clicking on the **Slideshow** button.
+
+
-To make a dashboard available offline, choose the **Make dashboard available offline** option in the **...More** menu. This will cause a reload of the dashboard where requests to the server are recorded and saved in browser storage. Note that offline dashboards are only available on the computer and browser where you set it to offline. If you currently have a filter applied when requesting the dashboard be made available offline, a dialog will appear to confirm the removal of the filters.
+When you enter the slideshow, you'll find navigation buttons and an exit button in a navigation bar at the bottom of the page. You can also navigate with the forward and back arrow keys on the keyboard, and exit the slideshow with the **esc** key. Any filters that are applied will be displayed in the navigation bar. Note that messages and spacer items are not displayed in the slideshow.
+
+
+
+### Make dashboards available offline
+
+To make a dashboard available offline, choose the **Make available offline** option in the **...** menu. This will cause a reload of the dashboard where requests to the server are recorded and saved in browser storage. Note that offline dashboards are only available on the computer and browser where you set it to offline. If you currently have a filter applied when requesting the dashboard be made available offline, a dialog will appear to confirm the removal of the filters.
-Dashboards that have been saved for offline have an indicator on the dashboard chip in the dashboards bar, as well as a tag showing the time it was saved.
+Dashboards that have been saved for offline display a tag next to the dashboard title showing the time it was saved. In the dashboard selector, an icon is displayed if the dashboard is available offline.
-If the dashboard has been changed since you made it available offline, either by you or someone else, you'll need to choose **Sync offline data now** from the **...More** menu to save the latest version of the dashboard.
-
-
+If the dashboard has been changed since you made it available offline, either by you or someone else, you'll need to choose **Sync offline data now** from the **...** menu to save the latest version of the dashboard.
-You can remove a dashboard from offline storaged by choosing **Remove from offline storage** in the **...More** menu.
+You can remove a dashboard from offline storaged by choosing **Remove from offline storage** in the **...** menu.
-
+
#### Other notes about Dashboards app when you are offline:
@@ -218,7 +231,7 @@ If you are offline, any buttons or actions that require a connection to complete
### Printing a dashboard
-From the **...More** menu you can print the current dashboard. There are two styles of dashboard print: _Dashboard layout_ and _One item per page_. For both styles, a title page is added that shows the dashboard title, description (if the _Show description_ setting is enabled), and any applied dashboard filters.
+From the **...** menu you can print the current dashboard. There are two styles of dashboard print: _Dashboard layout_ and _One item per page_. For both styles, a title page is added that shows the dashboard title, description (if the _Show description_ setting is enabled), and any applied dashboard filters.
@@ -244,19 +257,19 @@ Click on the **Print** button in the upper right to trigger the browser print fu
-## Dashboard items with charts, pivot tables or maps
+## Dashboard items with charts, pivot tables, maps and line lists
-Dashboard items with charts, pivot table or maps may have an item menu button in the upper right corner of the item with additional viewing options, depending on the system settings that have been configured for the DHIS2 instance. If all the relevant system settings have been disabled by the DHIS2 instance, then there will not be an item menu button. Here are the possible item menu options:
+Dashboard items with charts, pivot table, maps, line lists, event reports and event charts may have an item menu button in the upper right corner of the item with additional viewing options, depending on the system settings that have been configured for the DHIS2 instance. If all the relevant system settings have been disabled by the DHIS2 instance, then there will not be an item menu button. Here are the possible item menu options:
### Switching between visualizations
-It is possible to toggle the visualization view for items containing charts, pivot tables and maps. Click on the item menu button and choose the desired view (e.g., **View as Table**, **View as Map**, **View as Chart**):
+It is possible to toggle the visualization view of charts, pivot tables and maps, and between event charts and reports. Click on the item menu button and choose the desired view (e.g., **View as Table**, **View as Map**, **View as Chart**):
### View item in fullscreen
-To view the chart, table or map in fullscreen, click on the **View fullscreen** option. To exit fullscreen, you can either press **esc** key or click the exit button in the upper right corner of the fullscreen view.
+To view the chart, table, map or line list in fullscreen, click on the **View fullscreen** option. To exit fullscreen, you can either press **esc** key or click the exit button in the upper right corner of the fullscreen view. Note that you actually enter the slideshow, and can then use the navigation bar as described in the [Slideshow section](#dashboard-slideshow) to navigate to other dashboard items in fullscreen.
### Open in app
@@ -264,23 +277,23 @@ To open the visualization in its corresponding app (e.g., Data Visualizer, Maps)
### Show interpretations and details
-You can write interpretations for the chart, pivot table, map, event report, and event chart items by clicking on **Show interpretations and details**:
+You can write interpretations for charts, pivot tables, maps, line lists, event reports, and event charts by clicking on **Show interpretations and details**. The item will be expanded vertically underneath to show the description, interpretations and replies:
-The item will be expanded vertically underneath to show the description, interpretations and replies. You can like an interpretation, reply to an interpretation, and add your own interpretation. You can edit, share or delete your own interpretations and replies, and if you have moderator access, you can delete others’ interpretations.
+You can like an interpretation, reply to an interpretation, and add your own interpretations. You can edit, share or delete your own interpretations and replies, and if you have moderator access, you can delete others’ interpretations.
-It is possible to format the description field, and interpretations with **bold**, _italic_ by using the Markdown style markers \* and \_ for **bold** and _italic_ respectively. The text field for writing new interpretations has a toolbar for adding rich text. Keyboard shortcuts are also available: Ctrl/Cmd + B and Ctrl/Cmd + I. A limited set of smilies is supported and can be used by typing one of the following character combinations: :) :-) :( :-( :+1 :-1. URLs are automatically detected and converted into a clickable link.
+It is possible to format interpretation text with **bold**, _italic_ by using the Markdown style markers \* and \_ for **bold** and _italic_ respectively. The text field for writing new interpretations has a toolbar for adding rich text. Keyboard shortcuts are also available: Ctrl/Cmd + B and Ctrl/Cmd + I. A limited set of smilies is supported and can be used by typing one of the following character combinations: :) :-) :( :-( :+1 :-1. URLs are automatically detected and converted into a clickable link.
Interpretations are sorted in descending order by date, with the most recent shown on top. Interpretation replies are sorted in ascending order by date, with the oldest shown on top.
-
+
-## Sharing a dashboard { #dashboard_sharing }
+## Share the dashboard { #dashboard_sharing }
-In order to share a dashboard with users and user groups, click on the **Share** button to the right of the dashboard title to display the _Sharing and access_ dialog.
+In order to share the dashboard with users and user groups, click on the **Share** button to the right of the dashboard title to display the _Sharing and access_ dialog.
-
+
There are three levels of sharing permissions available for a dashboard:
@@ -302,7 +315,7 @@ All dashboards have the _All users_ group set to **No access** by default. The _
To share a dashboard with specific users and user groups, type the name in the input field, choose the desired access level and click on **Give access**.
-
+
You can provide users with the url of the dashboard, allowing them to navigate directly to the dashboard. To get the dashboard url, just open the dashboard in view mode, and copy the browser url. For example, the url to the Antenatal Care dashboard in play.dhis2.org/dev is:
@@ -312,4 +325,4 @@ https://play.dhis2.org/dev/dhis-web-dashboard/#/nghVC4wtyzi
To ensure that all charts, maps and tables on the dashboard are shared with the chosen users and user groups, click on the **Apply sharing to dashboard items** button.
-
+
diff --git a/docs/resources/images/dashboard-clear-filters-to-sync.png b/docs/resources/images/dashboard-clear-filters-to-sync.png
index 3583c53a6..41e7b536c 100644
Binary files a/docs/resources/images/dashboard-clear-filters-to-sync.png and b/docs/resources/images/dashboard-clear-filters-to-sync.png differ
diff --git a/docs/resources/images/dashboard-confirm-delete.png b/docs/resources/images/dashboard-confirm-delete.png
index b1b592957..4e02264f9 100644
Binary files a/docs/resources/images/dashboard-confirm-delete.png and b/docs/resources/images/dashboard-confirm-delete.png differ
diff --git a/docs/resources/images/dashboard-create-mode.png b/docs/resources/images/dashboard-create-mode.png
index c8ec30901..73e4b1c74 100644
Binary files a/docs/resources/images/dashboard-create-mode.png and b/docs/resources/images/dashboard-create-mode.png differ
diff --git a/docs/resources/images/dashboard-edit-anc.png b/docs/resources/images/dashboard-edit-anc.png
new file mode 100644
index 000000000..f49566b24
Binary files /dev/null and b/docs/resources/images/dashboard-edit-anc.png differ
diff --git a/docs/resources/images/dashboard-edit-button.png b/docs/resources/images/dashboard-edit-button.png
new file mode 100644
index 000000000..db22d1a47
Binary files /dev/null and b/docs/resources/images/dashboard-edit-button.png differ
diff --git a/docs/resources/images/dashboard-edit-print-preview.png b/docs/resources/images/dashboard-edit-print-preview.png
index bdd3bcda0..991a4bb12 100644
Binary files a/docs/resources/images/dashboard-edit-print-preview.png and b/docs/resources/images/dashboard-edit-print-preview.png differ
diff --git a/docs/resources/images/dashboard-filter-badges.png b/docs/resources/images/dashboard-filter-badges.png
index 5266adafd..e2dbe5757 100644
Binary files a/docs/resources/images/dashboard-filter-badges.png and b/docs/resources/images/dashboard-filter-badges.png differ
diff --git a/docs/resources/images/dashboard-filter-settings.png b/docs/resources/images/dashboard-filter-settings.png
index 8e81706e4..09da39edd 100644
Binary files a/docs/resources/images/dashboard-filter-settings.png and b/docs/resources/images/dashboard-filter-settings.png differ
diff --git a/docs/resources/images/dashboard-filters.png b/docs/resources/images/dashboard-filters.png
index 4681e4cc4..e9b640f9d 100644
Binary files a/docs/resources/images/dashboard-filters.png and b/docs/resources/images/dashboard-filters.png differ
diff --git a/docs/resources/images/dashboard-generic.png b/docs/resources/images/dashboard-generic.png
new file mode 100644
index 000000000..5c2b60d8b
Binary files /dev/null and b/docs/resources/images/dashboard-generic.png differ
diff --git a/docs/resources/images/dashboard-interpretations.png b/docs/resources/images/dashboard-interpretations.png
new file mode 100644
index 000000000..570917c22
Binary files /dev/null and b/docs/resources/images/dashboard-interpretations.png differ
diff --git a/docs/resources/images/dashboard-item-menu-interpretations.png b/docs/resources/images/dashboard-item-menu-interpretations.png
index d50233b8d..d9edcde1c 100644
Binary files a/docs/resources/images/dashboard-item-menu-interpretations.png and b/docs/resources/images/dashboard-item-menu-interpretations.png differ
diff --git a/docs/resources/images/dashboard-item-menu.png b/docs/resources/images/dashboard-item-menu.png
index 986687f37..0d117c02d 100644
Binary files a/docs/resources/images/dashboard-item-menu.png and b/docs/resources/images/dashboard-item-menu.png differ
diff --git a/docs/resources/images/dashboard-item-selector.png b/docs/resources/images/dashboard-item-selector.png
index a8c05edb5..f7469b0e5 100644
Binary files a/docs/resources/images/dashboard-item-selector.png and b/docs/resources/images/dashboard-item-selector.png differ
diff --git a/docs/resources/images/dashboard-layout-modal.png b/docs/resources/images/dashboard-layout-modal.png
index 594f5769e..27747bfd4 100644
Binary files a/docs/resources/images/dashboard-layout-modal.png and b/docs/resources/images/dashboard-layout-modal.png differ
diff --git a/docs/resources/images/dashboard-list-and-filter.png b/docs/resources/images/dashboard-list-and-filter.png
new file mode 100644
index 000000000..f4c0bea00
Binary files /dev/null and b/docs/resources/images/dashboard-list-and-filter.png differ
diff --git a/docs/resources/images/dashboard-more-menu.png b/docs/resources/images/dashboard-more-menu.png
index 7f9150f18..b194581d3 100644
Binary files a/docs/resources/images/dashboard-more-menu.png and b/docs/resources/images/dashboard-more-menu.png differ
diff --git a/docs/resources/images/dashboard-new-button.png b/docs/resources/images/dashboard-new-button.png
index 25781b134..803ced2b2 100644
Binary files a/docs/resources/images/dashboard-new-button.png and b/docs/resources/images/dashboard-new-button.png differ
diff --git a/docs/resources/images/dashboard-offline-dashboard.png b/docs/resources/images/dashboard-offline-dashboard.png
index ec2efc734..283b03606 100644
Binary files a/docs/resources/images/dashboard-offline-dashboard.png and b/docs/resources/images/dashboard-offline-dashboard.png differ
diff --git a/docs/resources/images/dashboard-orgunit-filter-dialog.png b/docs/resources/images/dashboard-orgunit-filter-dialog.png
deleted file mode 100644
index e158a36dd..000000000
Binary files a/docs/resources/images/dashboard-orgunit-filter-dialog.png and /dev/null differ
diff --git a/docs/resources/images/dashboard-period-filter-dialog.png b/docs/resources/images/dashboard-period-filter-dialog.png
new file mode 100644
index 000000000..7b8e20d3e
Binary files /dev/null and b/docs/resources/images/dashboard-period-filter-dialog.png differ
diff --git a/docs/resources/images/dashboard-place-items.png b/docs/resources/images/dashboard-place-items.png
new file mode 100644
index 000000000..73ef06aeb
Binary files /dev/null and b/docs/resources/images/dashboard-place-items.png differ
diff --git a/docs/resources/images/dashboard-print-menu.png b/docs/resources/images/dashboard-print-menu.png
index 53473be44..73b274344 100644
Binary files a/docs/resources/images/dashboard-print-menu.png and b/docs/resources/images/dashboard-print-menu.png differ
diff --git a/docs/resources/images/dashboard-search-for-dashboard.png b/docs/resources/images/dashboard-search-for-dashboard.png
deleted file mode 100644
index 63ac3cef3..000000000
Binary files a/docs/resources/images/dashboard-search-for-dashboard.png and /dev/null differ
diff --git a/docs/resources/images/dashboard-sharing-add-user.png b/docs/resources/images/dashboard-sharing-add-user.png
index b78187413..9eadd989c 100644
Binary files a/docs/resources/images/dashboard-sharing-add-user.png and b/docs/resources/images/dashboard-sharing-add-user.png differ
diff --git a/docs/resources/images/dashboard-sharing-cascade-sharing.png b/docs/resources/images/dashboard-sharing-cascade-sharing.png
index 46af33666..52b59e94b 100644
Binary files a/docs/resources/images/dashboard-sharing-cascade-sharing.png and b/docs/resources/images/dashboard-sharing-cascade-sharing.png differ
diff --git a/docs/resources/images/dashboard-sharing-dialog.png b/docs/resources/images/dashboard-sharing-dialog.png
index 6853cff2a..1e641f116 100644
Binary files a/docs/resources/images/dashboard-sharing-dialog.png and b/docs/resources/images/dashboard-sharing-dialog.png differ
diff --git a/docs/resources/images/dashboard-slideshow-button.png b/docs/resources/images/dashboard-slideshow-button.png
new file mode 100644
index 000000000..81609dced
Binary files /dev/null and b/docs/resources/images/dashboard-slideshow-button.png differ
diff --git a/docs/resources/images/dashboard-slideshow-navbar.png b/docs/resources/images/dashboard-slideshow-navbar.png
new file mode 100644
index 000000000..57c455798
Binary files /dev/null and b/docs/resources/images/dashboard-slideshow-navbar.png differ
diff --git a/docs/resources/images/dashboard-small-screen.png b/docs/resources/images/dashboard-small-screen.png
index 8099aa5b8..b26e6d0f6 100644
Binary files a/docs/resources/images/dashboard-small-screen.png and b/docs/resources/images/dashboard-small-screen.png differ
diff --git a/docs/resources/images/dashboard-spacer-edit-mode.png b/docs/resources/images/dashboard-spacer-edit-mode.png
index c03588b0d..285376f64 100644
Binary files a/docs/resources/images/dashboard-spacer-edit-mode.png and b/docs/resources/images/dashboard-spacer-edit-mode.png differ
diff --git a/docs/resources/images/dashboard-spacer-view-mode.png b/docs/resources/images/dashboard-spacer-view-mode.png
index 22a3a99d9..2ad12d8f9 100644
Binary files a/docs/resources/images/dashboard-spacer-view-mode.png and b/docs/resources/images/dashboard-spacer-view-mode.png differ
diff --git a/docs/resources/images/dashboard-sync-remove-offline.png b/docs/resources/images/dashboard-sync-remove-offline.png
new file mode 100644
index 000000000..466810721
Binary files /dev/null and b/docs/resources/images/dashboard-sync-remove-offline.png differ
diff --git a/docs/resources/images/dashboard-translation-dialog.png b/docs/resources/images/dashboard-translation-dialog.png
index 118375078..9321fce9f 100644
Binary files a/docs/resources/images/dashboard-translation-dialog.png and b/docs/resources/images/dashboard-translation-dialog.png differ
diff --git a/docs/resources/images/dashboard-view-mode.png b/docs/resources/images/dashboard-view-mode.png
index 6572b9297..ef998ad96 100644
Binary files a/docs/resources/images/dashboard-view-mode.png and b/docs/resources/images/dashboard-view-mode.png differ
diff --git a/i18n/en.pot b/i18n/en.pot
index 76eae083b..fa8cab2e1 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -5,26 +5,123 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-08-27T07:26:05.058Z\n"
-"PO-Revision-Date: 2024-08-27T07:26:05.060Z\n"
+"POT-Creation-Date: 2024-12-19T11:30:27.893Z\n"
+"PO-Revision-Date: 2024-12-19T11:30:27.893Z\n"
msgid "Untitled dashboard"
msgstr "Untitled dashboard"
-msgid "Cannot create a dashboard while offline"
-msgstr "Cannot create a dashboard while offline"
+msgid "Dashboards"
+msgstr "Dashboards"
-msgid "Create new dashboard"
-msgstr "Create new dashboard"
+msgid "The dashboard couldn't be made available offline. Try again."
+msgstr "The dashboard couldn't be made available offline. Try again."
+
+msgid "Remove from offline storage"
+msgstr "Remove from offline storage"
+
+msgid "Make available offline"
+msgstr "Make available offline"
+
+msgid "Sync offline data now"
+msgstr "Sync offline data now"
+
+msgid "Unstar dashboard"
+msgstr "Unstar dashboard"
+
+msgid "Star dashboard"
+msgstr "Star dashboard"
+
+msgid "Hide description"
+msgstr "Hide description"
+
+msgid "Show description"
+msgstr "Show description"
+
+msgid "Print"
+msgstr "Print"
+
+msgid "Dashboard layout"
+msgstr "Dashboard layout"
+
+msgid "One item per page"
+msgstr "One item per page"
+
+msgid "Close dashboard"
+msgstr "Close dashboard"
+
+msgid "No dashboard items to show in slideshow"
+msgstr "No dashboard items to show in slideshow"
+
+msgid "Not available offline"
+msgstr "Not available offline"
+
+msgid "Edit"
+msgstr "Edit"
+
+msgid "Share"
+msgstr "Share"
+
+msgid "Slideshow"
+msgstr "Slideshow"
+
+msgid "Clear dashboard filters?"
+msgstr "Clear dashboard filters?"
+
+msgid ""
+"A dashboard's filters can’t be saved offline. Do you want to remove the "
+"filters and make this dashboard available offline?"
+msgstr ""
+"A dashboard's filters can’t be saved offline. Do you want to remove the "
+"filters and make this dashboard available offline?"
+
+msgid "No, cancel"
+msgstr "No, cancel"
+
+msgid "Yes, clear filters and sync"
+msgstr "Yes, clear filters and sync"
+
+msgid "Cancel"
+msgstr "Cancel"
+
+msgid "Confirm"
+msgstr "Confirm"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Failed to unstar the dashboard"
+msgstr "Failed to unstar the dashboard"
+
+msgid "Failed to star the dashboard"
+msgstr "Failed to star the dashboard"
+
+msgid "Offline data last updated {{timeAgo}}"
+msgstr "Offline data last updated {{timeAgo}}"
+
+msgid "Synced {{timeAgo}}"
+msgstr "Synced {{timeAgo}}"
+
+msgid "Cannot unstar this dashboard while offline"
+msgstr "Cannot unstar this dashboard while offline"
+
+msgid "Cannot star this dashboard while offline"
+msgstr "Cannot star this dashboard while offline"
+
+msgid "No dashboards available."
+msgstr "No dashboards available."
+
+msgid "Create a new dashboard using the + button."
+msgstr "Create a new dashboard using the + button."
msgid "Search for a dashboard"
msgstr "Search for a dashboard"
-msgid "Show fewer dashboards"
-msgstr "Show fewer dashboards"
+msgid "No dashboards found"
+msgstr "No dashboards found"
-msgid "Show more dashboards"
-msgstr "Show more dashboards"
+msgid "{{appKey}} app not found"
+msgstr "{{appKey}} app not found"
msgid "Remove this item"
msgstr "Remove this item"
@@ -86,6 +183,9 @@ msgstr "Hide details and interpretations"
msgid "Show details and interpretations"
msgstr "Show details and interpretations"
+msgid "Open menu"
+msgstr "Open menu"
+
msgid "Open in {{appName}} app"
msgstr "Open in {{appName}} app"
@@ -149,8 +249,11 @@ msgstr "There was an error loading data for this item"
msgid "Open this item in {{appName}}"
msgstr "Open this item in {{appName}}"
-msgid "Not available offline"
-msgstr "Not available offline"
+msgid "Resources"
+msgstr "Resources"
+
+msgid "Reports"
+msgstr "Reports"
msgid "Visualizations"
msgstr "Visualizations"
@@ -176,12 +279,6 @@ msgstr "Line lists"
msgid "Apps"
msgstr "Apps"
-msgid "Reports"
-msgstr "Reports"
-
-msgid "Resources"
-msgstr "Resources"
-
msgid "Users"
msgstr "Users"
@@ -248,9 +345,6 @@ msgstr ""
"This action cannot be undone. Are you sure you want to permanently delete "
"this dashboard?"
-msgid "Cancel"
-msgstr "Cancel"
-
msgid "Discard changes"
msgstr "Discard changes"
@@ -310,9 +404,6 @@ msgstr "Available Filters"
msgid "Selected Filters"
msgstr "Selected Filters"
-msgid "Confirm"
-msgstr "Confirm"
-
msgid "There are no items on this dashboard"
msgstr "There are no items on this dashboard"
@@ -340,9 +431,6 @@ msgstr "Cannot search for dashboard items while offline"
msgid "Additional items"
msgstr "Additional items"
-msgid "Dashboard layout"
-msgstr "Dashboard layout"
-
msgid "Freeflow"
msgstr "Freeflow"
@@ -410,9 +498,6 @@ msgstr "End of dashboard"
msgid "Start of dashboard"
msgstr "Start of dashboard"
-msgid "Print"
-msgstr "Print"
-
msgid "dashboard layout"
msgstr "dashboard layout"
@@ -463,13 +548,19 @@ msgstr "No dashboards found. Use the + button to create a new dashboard."
msgid "Requested dashboard not found"
msgstr "Requested dashboard not found"
+msgid "No description"
+msgstr "No description"
+
msgid "{{count}} selected"
msgid_plural "{{count}} selected"
msgstr[0] "{{count}} selected"
msgstr[1] "{{count}} selected"
-msgid "Cannot remove filters while offline"
-msgstr "Cannot remove filters while offline"
+msgid "Cannot edit filters while offline"
+msgstr "Cannot edit filters while offline"
+
+msgid "Cannot edit filters on a small screen"
+msgstr "Cannot edit filters on a small screen"
msgid "Removing filters while offline"
msgstr "Removing filters while offline"
@@ -481,84 +572,25 @@ msgstr ""
"Removing this filter while offline will remove all other filters. Do you "
"want to remove all filters on this dashboard?"
-msgid "No, cancel"
-msgstr "No, cancel"
-
msgid "Yes, remove filters"
msgstr "Yes, remove filters"
-msgid "The dashboard couldn't be made available offline. Try again."
-msgstr "The dashboard couldn't be made available offline. Try again."
-
-msgid "Failed to unstar the dashboard"
-msgstr "Failed to unstar the dashboard"
-
-msgid "Failed to star the dashboard"
-msgstr "Failed to star the dashboard"
-
-msgid "Remove from offline storage"
-msgstr "Remove from offline storage"
-
-msgid "Make available offline"
-msgstr "Make available offline"
-
-msgid "Sync offline data now"
-msgstr "Sync offline data now"
-
-msgid "Unstar dashboard"
-msgstr "Unstar dashboard"
-
-msgid "Star dashboard"
-msgstr "Star dashboard"
-
-msgid "Hide description"
-msgstr "Hide description"
-
-msgid "Show description"
-msgstr "Show description"
-
-msgid "One item per page"
-msgstr "One item per page"
-
-msgid "Close dashboard"
-msgstr "Close dashboard"
-
-msgid "More"
-msgstr "More"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "Share"
-msgstr "Share"
-
-msgid "Clear dashboard filters?"
-msgstr "Clear dashboard filters?"
-
-msgid ""
-"A dashboard's filters can’t be saved offline. Do you want to remove the "
-"filters and make this dashboard available offline?"
-msgstr ""
-"A dashboard's filters can’t be saved offline. Do you want to remove the "
-"filters and make this dashboard available offline?"
-
-msgid "Yes, clear filters and sync"
-msgstr "Yes, clear filters and sync"
-
-msgid "No description"
-msgstr "No description"
+msgid "Exit slideshow"
+msgstr "Exit slideshow"
-msgid "Add filter"
-msgstr "Add filter"
+msgid "Previous item"
+msgstr "Previous item"
-msgid "Offline data last updated {{time}}"
-msgstr "Offline data last updated {{time}}"
+msgid "Next item"
+msgstr "Next item"
-msgid "Cannot unstar this dashboard while offline"
-msgstr "Cannot unstar this dashboard while offline"
+msgid "{{name}}: {{filter}}"
+msgstr "{{name}}: {{filter}}"
-msgid "Cannot star this dashboard while offline"
-msgstr "Cannot star this dashboard while offline"
+msgid "{{count}} filters active"
+msgid_plural "{{count}} filters active"
+msgstr[0] "{{count}} filter active"
+msgstr[1] "{{count}} filters active"
msgid "Loading dashboard – {{name}}"
msgstr "Loading dashboard – {{name}}"
@@ -566,6 +598,12 @@ msgstr "Loading dashboard – {{name}}"
msgid "Loading dashboard"
msgstr "Loading dashboard"
+msgid "Load dashboard failed"
+msgstr "Load dashboard failed"
+
+msgid "This dashboard could not be loaded. Please try again later."
+msgstr "This dashboard could not be loaded. Please try again later."
+
msgid "Offline"
msgstr "Offline"
@@ -574,9 +612,3 @@ msgstr "This dashboard cannot be loaded while offline."
msgid "Go to start page"
msgstr "Go to start page"
-
-msgid "Load dashboard failed"
-msgstr "Load dashboard failed"
-
-msgid "This dashboard could not be loaded. Please try again later."
-msgstr "This dashboard could not be loaded. Please try again later."
diff --git a/package.json b/package.json
index 131892cf7..b62d147e0 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
"private": true,
"license": "BSD-3-Clause",
"dependencies": {
- "@dhis2/analytics": "^26.8.2",
+ "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#e398d08e696356908725c8f51f32c30e7cb002ec",
"@dhis2/app-runtime": "^3.10.6",
"@dhis2/app-runtime-adapter-d2": "^1.1.0",
"@dhis2/d2-i18n": "^1.1.3",
- "@dhis2/ui": "^9.11.3",
+ "@dhis2/ui": "^10.1.4",
"@krakenjs/post-robot": "^11.0.0",
"classnames": "^2.3.2",
"d2": "^31.10.0",
@@ -51,9 +51,10 @@
"@semantic-release/changelog": "^6",
"@semantic-release/exec": "^6",
"@semantic-release/git": "^10",
- "@testing-library/jest-dom": "^6.1.2",
+ "@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^12",
"cypress": "^13.13.1",
+ "cypress-real-events": "^1.13.0",
"d2-manifest": "^1.0.0",
"eslint-plugin-cypress": "^3.3.0",
"immutability-helper": "^3.1.1",
@@ -68,6 +69,12 @@
"jest": {
"moduleNameMapper": {
"^.+\\.(css|sass|scss)$": "identity-obj-proxy"
- }
+ },
+ "setupFilesAfterEnv": [
+ "{i18n.t('No dashboards available.')}
+{i18n.t('Create a new dashboard using the + button.')}
+